Remove yang-test

[controller.git] / opendaylight / config / yang-jmx-generator-plugin / src / test / java / org / opendaylight / controller / config / yangjmxgenerator / plugin / JMXGeneratorTest.java

diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGeneratorTest.java b/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGeneratorTest.java
index 2fe087130833fcd527c569230572dab1544a1703..c306a1bbd119277cbefb3e23372d44e716410bd4 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGeneratorTest.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGeneratorTest.java
@@ -17,10 +17,10 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.opendaylight.controller.config.yangjmxgenerator.PackageTranslatorTest.EXPECTED_PACKAGE_PREFIX;
+
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParseException;
 import com.github.javaparser.ast.CompilationUnit;
-import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Files;
@@ -32,6 +32,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -107,8 +108,8 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
 
     @Test
     public void generateSIsMBsTest() {
-        Collection<File> files = jmxGenerator.generateSources(context,
-                outputBaseDir, context.getModules());
+        Collection<File> files = jmxGenerator.generateSources(context, outputBaseDir, context.getModules(),
+            m -> Optional.empty());
         List<String> expectedFileNames = new ArrayList<>();
         expectedFileNames
                 .addAll(ServiceInterfaceEntryTest.expectedSIEFileNames);
@@ -148,8 +149,8 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
 
     @Test
     public void generateSIEsTest() throws IOException, ParseException {
-        Collection<File> files = jmxGenerator.generateSources(context,
-                outputBaseDir, Collections.singleton(threadsModule));
+        Collection<File> files = jmxGenerator.generateSources(context, outputBaseDir,
+            Collections.singleton(threadsModule), m -> Optional.empty());
         assertEquals(ServiceInterfaceEntryTest.expectedSIEFileNames, toFileNames(files));
 
         for (File file : files) {
@@ -206,7 +207,7 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
         jmxGenerator.setAdditionalConfig(map);
 
         Collection<File> files = jmxGenerator.generateSources(context, outputBaseDir,
-            Collections.singleton(bgpListenerJavaModule));
+            Collections.singleton(bgpListenerJavaModule), m -> Optional.empty());
 
         assertEquals(expectedGenerateMBEsListNames, toFileNames(files));
     }
@@ -218,7 +219,7 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
         jmxGenerator.setAdditionalConfig(map);
 
         Collection<File> files = jmxGenerator.generateSources(context, outputBaseDir,
-            Collections.singleton(threadsJavaModule));
+            Collections.singleton(threadsJavaModule), m -> Optional.empty());
 
         assertEquals(expectedModuleFileNames, toFileNames(files));
 
@@ -262,12 +263,7 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
             }
         }
 
-        verifyXmlFiles(Collections2.filter(files, new Predicate<File>() {
-            @Override
-            public boolean apply(final File input) {
-                return input.getName().endsWith("xml");
-            }
-        }));
+        verifyXmlFiles(Collections2.filter(files, input -> input.getName().endsWith("xml")));
 
         // verify ModuleFactory file
         File moduleFactoryFile = JMXGenerator.concatFolders(generatedResourcesDir, "META-INF", "services",
@@ -324,7 +320,7 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
         visitor.assertField(
                 "private static final java.util.Set<Class<? extends org.opendaylight.controller.config.api.annotations.AbstractServiceInterface>> serviceIfcs");
 
-        assertFactoryMethods(visitor.methods, 9);
+        assertFactoryMethods(visitor.methods, 10);
         visitor.assertMethodDescriptions(0);
         visitor.assertMethodJavadocs(0);
     }
@@ -371,7 +367,7 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
         args.add(new ArgumentAssertion("Class<? extends org.opendaylight.controller.config.api.annotations.AbstractServiceInterface>", "serviceInterface"));
         assertMethodPresent(methods, new MethodAssertion("boolean", "isModuleImplementingServiceInterface", args));
 
-        assertEquals(methods.size(), expectedSize);
+        assertEquals(expectedSize, methods.size());
     }
 
     private static void assertMethodPresent(final Set<String> methods, final MethodAssertion methodAssertion) {
@@ -392,7 +388,7 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
         visitor.assertField("private java.lang.Long maximumSize");
         visitor.assertField("private javax.management.ObjectName threadfactory");
         visitor.assertField("private java.util.concurrent.ThreadFactory threadfactoryDependency");
-        visitor.assertField("private java.lang.Long keepAlive = new java.lang.Long(\"10\")");
+        visitor.assertField("private java.lang.Long keepAlive = java.lang.Long.valueOf(\"10\")");
         visitor.assertField("private java.lang.Long coreSize");
         visitor.assertField("private byte[] binary");
 
@@ -436,7 +432,7 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
 
         @Override
         public String toString() {
-            final StringBuffer sb = new StringBuffer();
+            final StringBuilder sb = new StringBuilder();
             sb.append(type).append(' ');
             sb.append(name).append('(');
 
@@ -464,10 +460,7 @@ public class JMXGeneratorTest extends AbstractGeneratorTest {
 
         @Override
         public String toString() {
-            final StringBuffer sb = new StringBuffer();
-            sb.append(type).append(' ');
-            sb.append(name);
-            return sb.toString();
+            return type + " " + name;
         }
     }
 }