Address comments of code review

Author: vmutafov

test-app/app/build.gradle

@@ -18,13 +18,16 @@
 *            -PandroidXMaterial=[androidx_material_version]
 */
 
+
+import groovy.io.FileType
 import groovy.json.JsonSlurper
+
+import javax.inject.Inject
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
-import groovy.io.FileType
 import java.security.MessageDigest
-import javax.inject.Inject
+
 apply plugin: "com.android.application"
 
 def onlyX86 = project.hasProperty("onlyX86")
@@ -545,7 +548,7 @@ afterEvaluate { project ->
                 // if there's a project dependency search for its result jar file in the build/intermediates/runtime_library_classes folder
                 // this is the output folder in gradle 5.1.1, but it can be changed in the future versions of gradle
                 def jarDir = new File("${it.getBuildDir()}/intermediates/runtime_library_classes/${buildType.toLowerCase()}")
-                if(jarDir.exists()) {
+                if (jarDir.exists()) {
                     jarDir.eachFileRecurse(FileType.FILES) { file ->
                         if (file.path.endsWith(".jar")) {
                             processJar(file, jars)
@@ -574,7 +577,7 @@ def processJar(File jar, jars) {
         // directory is a randomly generated string)
         cleanupAllJars.inputs.files jar
 
-        task "${taskName}" (type: WorkerTask) {
+        task "${taskName}"(type: WorkerTask) {
             dependsOn cleanupAllJars
             extractAllJars.dependsOn it
 
@@ -695,7 +698,12 @@ task buildMetadata(type: JavaExec) {
 
         def generatedClasses = new LinkedList<String>()
         for (File subDir : classesSubDirs) {
+            System.out.println("!!!!! VM: subdir path: " + subDir.getAbsolutePath())
+            System.out.println("!!!!! VM: subdir name: " + subDir.getName())
+            System.out.println("!!!!! VM: build type: " + selectedBuildType)
+
             if (subDir.getName().equals(selectedBuildType)) {
+                System.out.println("!!!!! VM: adding")
                 generatedClasses.add(subDir.getAbsolutePath())
             }
         }

test-app/app/src/main/assets/app/tests/testsForRuntimeBindingGenerator.js

@@ -49,6 +49,21 @@ describe("Tests for runtime binding generator", function () {
 		expect(isInstanceOf).toEqual(true);
 	});
 
+    it("When_implementing_interface_and_its_implemented_interfaces", function() {
+	    var impl = new com.tns.tests.MyDerivedPublicInterface({
+        		methodOfMyDerivedPublicInterface: function(input) {
+      			    return "Le java " + input;
+        		},
+        		methodOfMyPublicInterface: function(input) {
+        		    return "Le java " + input;
+        		}
+        	});
+
+         	var expected = "Le java test derived method";
+        	var actual = impl.methodOfMyPublicInterface("test derived method");
+        	expect(actual).toBe(expected);
+        });
+
 	it("When_generating_a_class_that_implements_interfaces_javascript", function() {
 
 	    __log("TEST: When_generating_a_class_that_implements_interfaces_javascript");

test-app/runtime/src/main/java/com/tns/DexFactory.java

@@ -157,12 +157,11 @@ public Class<?> resolveClass(String baseClassName, String name, String className
         }
 
         Class<?> result;
+        DexClassLoader dexClassLoader = new DexClassLoader(jarFilePath, this.odexDir.getAbsolutePath(), null, classLoader);
 
         if (isInterface) {
-            DexClassLoader dexClassLoader = new DexClassLoader(jarFilePath, this.odexDir.getAbsolutePath(), null, classLoader);
             result = dexClassLoader.loadClass(fullClassName);
         } else {
-            DexClassLoader dexClassLoader = new DexClassLoader(jarFilePath, this.odexDir.getAbsolutePath(), null, classLoader);
             result = dexClassLoader.loadClass(desiredDexClassName);
         }
 

test-app/runtime/src/main/java/com/tns/system/classes/loading/LookedUpClassNotFound.java

@@ -0,0 +1,10 @@
+package com.tns.system.classes.loading;
+
+public class LookedUpClassNotFound extends RuntimeException {
+
+    private static final long serialVersionUID = 123321L;
+
+    public LookedUpClassNotFound(String message) {
+        super(message);
+    }
+}

test-app/runtime/src/main/java/com/tns/system/classes/loading/impl/ClassStorageServiceImpl.java

@@ -2,6 +2,7 @@
 
 import com.tns.system.classes.caching.ClassCache;
 import com.tns.system.classes.loading.ClassStorageService;
+import com.tns.system.classes.loading.LookedUpClassNotFound;
 import com.tns.system.classloaders.ClassLoadersCollection;
 
 public class ClassStorageServiceImpl implements ClassStorageService {
@@ -42,7 +43,7 @@ public Class<?> retrieveClass(String lookupKey) {
             }
         }
 
-        throw new RuntimeException("Class \"" + lookupKey + "\" not found.");
+        throw new LookedUpClassNotFound("Class \"" + lookupKey + "\" not found.");
     }
 
     @Override

test-app/runtime/src/main/java/com/tns/system/classloaders/ClassLoadersCollection.java

@@ -3,6 +3,18 @@
 import java.util.Collection;
 
 public interface ClassLoadersCollection {
+
+    /**
+     * Adds a class loader to the internal collection of class loaders
+     *
+     * @param classLoader class loader to add; should not be null
+     */
     void addClassLoader(ClassLoader classLoader);
+
+    /**
+     * Returns an unmodifiable collection of the stored class loaders
+     *
+     * @return unmodifiable collection
+     */
     Collection<ClassLoader> getClassLoadersCollection();
 }

test-app/runtime/src/test/java/com/tns/system/classes/loading/impl/ClassStorageServiceImplTest.java

@@ -2,6 +2,7 @@
 
 import com.tns.system.classes.caching.ClassCache;
 import com.tns.system.classes.loading.ClassStorageService;
+import com.tns.system.classes.loading.LookedUpClassNotFound;
 import com.tns.system.classloaders.ClassLoadersCollection;
 
 import org.junit.Before;
@@ -95,8 +96,7 @@ public void testRetrieveClassShouldThrowExceptionIfClassIsNotFound() {
         try {
             classStorageService.retrieveClass(TEST_CLASS_LOOKUP_NAME);
             fail();
-        } catch (RuntimeException e) {
-            assertEquals("Unexpected exception type", RuntimeException.class.getName(), e.getClass().getName());
+        } catch (LookedUpClassNotFound e) {
             assertEquals("Unexpected exception message", "Class \"" + TEST_CLASS_LOOKUP_NAME + "\" not found.", e.getMessage());
         }
     }

test-app/runtime/src/test/java/com/tns/system/classloaders/impl/ClassLoadersCollectionImplTest.java

@@ -24,23 +24,10 @@ public void testAddClassLoaderShouldThrowExceptionIfClassLoaderIsNull() {
         }
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void testGetClassLoadersCollectionIsImmutable() {
         Collection<ClassLoader> classLoaders = classLoadersCollection.getClassLoadersCollection();
 
-        classLoaders.add(null);
-        fail();
-        classLoaders.addAll(null);
-        fail();
-        classLoaders.clear();
-        fail();
-        classLoaders.remove(null);
-        fail();
-        classLoaders.removeAll(null);
-        fail();
-        classLoaders.retainAll(null);
-        fail();
-        classLoaders.iterator().remove();
-        fail();
+        assertEquals("Unexpected collection type", "UnmodifiableCollection", classLoaders.getClass().getSimpleName());
     }
 }