import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import com.google.common.base.Preconditions;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-
import org.junit.Ignore;
import org.junit.Test;
import org.opendaylight.controller.config.yangjmxgenerator.plugin.util.NameConflictException;
import org.opendaylight.controller.config.yangjmxgenerator.plugin.util.YangModelSearchUtils;
import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl;
-import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-
public class ModuleMXBeanEntryNameConflictTest extends AbstractYangTest {
- private static final Logger logger = LoggerFactory
+ private static final Logger LOG = LoggerFactory
.getLogger(ModuleMXBeanEntryNameConflictTest.class);
public static final String PACKAGE_NAME = "pack2";
Module testedModule = loadYangs(yangFile, moduleName);
try {
- logger.debug("Testing {}", yangFile);
+ LOG.debug("Testing {}", yangFile);
ModuleMXBeanEntry.create(testedModule,
- new HashMap<QName, ServiceInterfaceEntry>(), context,
+ new HashMap<>(), context,
new TypeProviderWrapper(new TypeProviderImpl(context)),
PACKAGE_NAME);
fail(yangFile.toString()
"port");
}
- private String getYangModuleName(String name) {
+ private static String getYangModuleName(final String name) {
int startIndex = 0;
int endIndex = name.indexOf(".yang");
return name.substring(startIndex, endIndex);
}
- private Module loadYangs(File testedModule, String moduleName)
+ private Module loadYangs(final File testedModule, final String moduleName)
throws Exception {
List<InputStream> yangISs = new ArrayList<>();
yangISs.addAll(getStreams("/ietf-inet-types.yang"));
yangISs.addAll(getConfigApiYangInputStreams());
- YangParserImpl parser = new YangParserImpl();
- Set<Module> modulesToBuild = parser.parseYangModelsFromStreams(yangISs);
+ context = YangParserTestUtils.parseYangStreams(yangISs);
// close ISs
for (InputStream is : yangISs) {
is.close();
}
- context = parser.resolveSchemaContext(modulesToBuild);
namesToModules = YangModelSearchUtils.mapModulesByNames(context
.getModules());
configModule = namesToModules.get(ConfigConstants.CONFIG_MODULE);