JavaIdentifierNormalizer ThreadSafe/Memory leak fix

[mdsal.git] / binding2 / mdsal-binding2-generator-util / src / test / java / org / opendaylight / mdsal / binding / javav2 / generator / util / JavaIdentifierNormalizerTest.java

diff --git a/binding2/mdsal-binding2-generator-util/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizerTest.java b/binding2/mdsal-binding2-generator-util/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizerTest.java
index ab80a93b389d844196add39f61c443504784aae9..32210f52b2ca27bf7f4766b880a0c0db48c3cf28 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizerTest.java
+++ b/binding2/mdsal-binding2-generator-util/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizerTest.java
@@ -11,68 +11,72 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
 import org.opendaylight.mdsal.binding.javav2.util.BindingMapping;
 
 public class JavaIdentifierNormalizerTest {
 
     @Test
     public void specialPathsTest() {
+        ModuleContext context = new ModuleContext();
         // QName - reserved & non reserved
         String normalizeIdentifier =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.opendaylight.yangtools.yang.common", "QName");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.opendaylight.yangtools.yang.common",
+                        "QName", context);
         assertEquals("QName", normalizeIdentifier);
         // again reserved
         normalizeIdentifier =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.opendaylight.yangtools.yang.common", "QName");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.opendaylight.yangtools.yang.common",
+                        "QName", context);
         assertEquals("QName", normalizeIdentifier);
         // non reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("qname.non.reserved", "QName");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("qname.non.reserved", "QName", context);
         assertEquals("Qname", normalizeIdentifier);
         // again non reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("qname.non.reserved", "QName");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("qname.non.reserved", "QName", context);
         assertEquals("Qname1", normalizeIdentifier);
 
         // Augmentable - reserved & non reserved
         normalizeIdentifier = JavaIdentifierNormalizer
-                .normalizeClassIdentifier("org.opendaylight.mdsal.binding.javav2.spec.structural", "Augmentable");
+                .normalizeClassIdentifier("org.opendaylight.mdsal.binding.javav2.spec.structural", "Augmentable", context);
         assertEquals("Augmentable", normalizeIdentifier);
         // again reserved
         normalizeIdentifier = JavaIdentifierNormalizer
-                .normalizeClassIdentifier("org.opendaylight.mdsal.binding.javav2.spec.structural", "Augmentable");
+                .normalizeClassIdentifier("org.opendaylight.mdsal.binding.javav2.spec.structural", "Augmentable", context);
         assertEquals("Augmentable", normalizeIdentifier);
         // non reserved
         normalizeIdentifier = JavaIdentifierNormalizer
-                .normalizeClassIdentifier("augmentable.non.reserved", "Augmentable");
+                .normalizeClassIdentifier("augmentable.non.reserved", "Augmentable", context);
         assertEquals("Augmentable", normalizeIdentifier);
         // again non reserved
         normalizeIdentifier =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("augmentable.non.reserved", "Augmentable");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("augmentable.non.reserved", "Augmentable", context);
         assertEquals("Augmentable1", normalizeIdentifier);
 
         // List - reserved & non reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.util", "List");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.util", "List", context);
         assertEquals("List", normalizeIdentifier);
         // again reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.util", "List");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.util", "List", context);
         assertEquals("List", normalizeIdentifier);
         // non reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("list.non.reserved", "List");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("list.non.reserved", "List", context);
         assertEquals("List", normalizeIdentifier);
         // again non reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("list.non.reserved", "List");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("list.non.reserved", "List", context);
         assertEquals("List1", normalizeIdentifier);
 
         // String - reserved & non reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.lang", "String");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.lang", "String", context);
         assertEquals("String", normalizeIdentifier);
         // again reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.lang", "String");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.lang", "String", context);
         assertEquals("String", normalizeIdentifier);
         // non reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("string.non.reserved", "String");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("string.non.reserved", "String", context);
         assertEquals("String", normalizeIdentifier);
         // again non reserved
-        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("string.non.reserved", "String");
+        normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("string.non.reserved", "String", context);
         assertEquals("String1", normalizeIdentifier);
     }
 
@@ -81,16 +85,21 @@ public class JavaIdentifierNormalizerTest {
      */
     @Test
     public void sameClassNamesSamePackageTest() {
-        String normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "Foo");
-        String normalizeIdentifier2 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "fOo");
+        ModuleContext context = new ModuleContext();
+        String normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package",
+                "Foo", context);
+        String normalizeIdentifier2 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package",
+                "fOo", context);
         final String normalizeIdentifier3 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "foo");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "foo", context);
         assertEquals(normalizeIdentifier1, "Foo");
         assertEquals(normalizeIdentifier2, "Foo1");
         assertEquals(normalizeIdentifier3, "Foo2");
 
-        normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "*");
-        normalizeIdentifier2 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "asterisk");
+        normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "*",
+                context);
+        normalizeIdentifier2 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package",
+                "asterisk", context);
         assertEquals(normalizeIdentifier1, "Asterisk");
         assertEquals(normalizeIdentifier2, "Asterisk1");
     }
@@ -100,19 +109,21 @@ public class JavaIdentifierNormalizerTest {
      */
     @Test
     public void sameClassNamesOtherPackageTest() {
+        ModuleContext context = new ModuleContext();
         String normalizeIdentifier1 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package", "Foo");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package", "Foo", context);
         String normalizeIdentifier2 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next", "fOo");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next", "fOo", context);
         final String normalizeIdentifier3 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next.next", "foo");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next.next", "foo", context);
         assertEquals(normalizeIdentifier1, "Foo");
         assertEquals(normalizeIdentifier2, "Foo");
         assertEquals(normalizeIdentifier3, "Foo");
 
-        normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package", "*");
+        normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package", "*",
+                context);
         normalizeIdentifier2 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next", "asterisk");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next", "asterisk", context);
         assertEquals(normalizeIdentifier1, "Asterisk");
         assertEquals(normalizeIdentifier2, "Asterisk");
     }
@@ -122,12 +133,13 @@ public class JavaIdentifierNormalizerTest {
      */
     @Test
     public void sameClassNamesSamePackageReservedWordsTest() {
+        ModuleContext context = new ModuleContext();
         final String normalizeIdentifier1 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "int");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "int", context);
         final String normalizeIdentifier2 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "InT");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "InT", context);
         final String normalizeIdentifier3 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "inT");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "inT", context);
         assertEquals(normalizeIdentifier1, "IntReservedKeyword");
         assertEquals(normalizeIdentifier2, "IntReservedKeyword1");
         assertEquals(normalizeIdentifier3, "IntReservedKeyword2");
@@ -138,12 +150,14 @@ public class JavaIdentifierNormalizerTest {
      */
     @Test
     public void sameClassNamesOtherPackageReservedWordsTest() {
+        ModuleContext context = new ModuleContext();
         final String normalizeIdentifier1 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package", "int");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package", "int", context);
         final String normalizeIdentifier2 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package.next", "InT");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package.next", "InT", context);
         final String normalizeIdentifier3 =
-                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package.next.next", "inT");
+                JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package.next.next",
+                        "inT", context);
         assertEquals(normalizeIdentifier1, "IntReservedKeyword");
         assertEquals(normalizeIdentifier2, "IntReservedKeyword");
         assertEquals(normalizeIdentifier3, "IntReservedKeyword");