Fix ContextManager#unregisterContext

DEVSIX-6945

Author: vitali.prudnikovich

commons/src/main/java/com/itextpdf/commons/actions/contexts/ContextManager.java

@@ -114,12 +114,12 @@ public IContext getContext(String className) {
 
     String getRecognisedNamespace(String className) {
         if (className != null) {
+            String normalizedClassName = normalize(className);
             // If both "a" and "a.b" namespaces are registered,
             // iText should consider the context of "a.b" for an "a.b" event,
             // that's why the contexts are sorted by the length of the namespace
             for (String namespace : contextMappings.keySet()) {
-                //Conversion to lowercase is done to be compatible with possible changes in case of packages/namespaces
-                if (className.toLowerCase().startsWith(namespace)) {
+                if (normalizedClassName.startsWith(namespace)) {
                     return namespace;
                 }
             }
@@ -129,7 +129,7 @@ String getRecognisedNamespace(String className) {
 
     void unregisterContext(Collection<String> namespaces) {
         for (String namespace : namespaces) {
-            contextMappings.remove(namespace);
+            contextMappings.remove(normalize(namespace));
         }
     }
 
@@ -143,11 +143,15 @@ private IContext getNamespaceMapping(String namespace) {
     void registerGenericContext(Collection<String> namespaces, Collection<String> products) {
         final GenericContext context = new GenericContext(products);
         for (String namespace : namespaces) {
-            //Conversion to lowercase is done to be compatible with possible changes in case of packages/namespaces
-            contextMappings.put(namespace.toLowerCase(), context);
+            contextMappings.put(normalize(namespace), context);
         }
     }
 
+    private static String normalize(String namespace) {
+        // Conversion to lowercase is done to be compatible with possible changes in case of packages/namespaces
+        return namespace.toLowerCase();
+    }
+
     private static class LengthComparator implements Comparator<String> {
         @Override
         public int compare(String o1, String o2) {

commons/src/test/java/com/itextpdf/commons/actions/contexts/ContextManagerTest.java

@@ -48,6 +48,7 @@ This file is part of the iText (R) project.
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -95,13 +96,27 @@ public void notRegisteredNamespaceTest() {
     @Test
     public void unregisterNamespaceTest() {
         String testNamespace = "com.hello.world";
+        String testNamespaceWithCapitals = "com.Bye.World";
+        List<String> testNamespaces = Arrays.asList(
+                testNamespace,
+                testNamespaceWithCapitals
+        );
+
         ContextManager manager = new ContextManager();
         Assert.assertNull(manager.getRecognisedNamespace(testNamespace));
-        manager.registerGenericContext(Arrays.asList(testNamespace), Arrays.asList("myProduct"));
+        Assert.assertNull(manager.getRecognisedNamespace(testNamespaceWithCapitals));
+
+        manager.registerGenericContext(testNamespaces, Arrays.asList("myProduct"));
+
         Assert.assertEquals(testNamespace,
                 manager.getRecognisedNamespace(testNamespace + ".MyClass"));
-        manager.unregisterContext(Arrays.asList(testNamespace));
+        Assert.assertEquals(testNamespaceWithCapitals.toLowerCase(),
+                manager.getRecognisedNamespace(testNamespaceWithCapitals + ".MyClass"));
+
+        manager.unregisterContext(testNamespaces);
+
         Assert.assertNull(manager.getRecognisedNamespace(testNamespace));
+        Assert.assertNull(manager.getRecognisedNamespace(testNamespaceWithCapitals));
     }
 
     @Test