Revert last 2 commits - reverted to original DynamicClassLoader

Author: KirillovProj

src/main/java/org/hyperskill/hstest/dynamic/DynamicClassLoader.java

@@ -24,12 +24,23 @@ public DynamicClassLoader(Class<?> clazz) {
     }
 
     protected synchronized Class<?> loadClass(String name, boolean resolve)
-            throws ClassNotFoundException {
-        Class<?> result = findClass(name);
+        throws ClassNotFoundException {
+
+        Class<?> c = findLoadedClass(name);
+        if (c == null) {
+            try {
+                if (getParent() != null) {
+                    c = getParent().loadClass(name);
+                }
+            } catch (ClassNotFoundException e) {
+                c = findClass(name);
+            }
+        }
+
         if (resolve) {
-            resolveClass(result);
+            resolveClass(c);
         }
-        return result;
+        return c;
     }
 
     protected Class<?> findClass(String name) throws ClassNotFoundException {
@@ -45,7 +56,7 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
             if (classBytes == null) {
                 File f = findFile(name);
                 if (f == null) {
-                    return findSystemClass(name);
+                    throw new ClassNotFoundException(name);
                 }
 
                 classBytes = loadFileAsBytes(f);
@@ -55,10 +66,10 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
             result = defineClass(name, classBytes, 0, classBytes.length);
         } catch (IOException e) {
             throw new ClassNotFoundException(
-                    "Cannot load class " + name + ": " + e);
+                "Cannot load class " + name + ": " + e);
         } catch (ClassFormatError e) {
             throw new ClassNotFoundException(
-                    "Format of class file incorrect for class " + name + " : " + e);
+                "Format of class file incorrect for class " + name + " : " + e);
         }
 
         savedClasses.put(name, result);
@@ -67,10 +78,10 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
 
     private File findFile(String name) {
         File f = new File(
-                searchLocation
-                        + File.separator
-                        + name.replace(".", File.separator)
-                        + ".class"
+            searchLocation
+                + File.separator
+                + name.replace(".", File.separator)
+                + ".class"
         );
 
         if (f.exists()) {

src/main/java/org/hyperskill/hstest/testing/execution/MainMethodExecutor.java

@@ -79,17 +79,13 @@ private void initByPackageName(String packageName) {
     }
 
     private void initByClassName(String className) {
-        this.className = className;
-
-        if (!useSeparateClassLoader) {
-            try {
-                Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
-                initByClassInstance(clazz);
-            } catch (ClassNotFoundException | NoClassDefFoundError ex) {
-                throw new ErrorWithFeedback(
-                        "Cannot find either a package or a class named \"" + className + "\". " +
-                                "Check if you've created one of these.");
-            }
+        try {
+            Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
+            initByClassInstance(clazz);
+        } catch (ClassNotFoundException | NoClassDefFoundError ex) {
+            throw new ErrorWithFeedback(
+                    "Cannot find either a package or a class named \"" + className + "\". " +
+                    "Check if you've created one of these.");
         }
     }
 
@@ -138,27 +134,15 @@ private void initMethod() {
 
         try {
             if (useSeparateClassLoader) {
-                if (clazz == null) {
-                    clazz = Thread.currentThread().getContextClassLoader().loadClass(className);
-                }
-
                 ClassLoader cl = new DynamicClassLoader(clazz);
 
-                if (runClass == null) {
-                    runClass = cl.loadClass(className);
-                } else {
-                    className = clazz.getName();
-                    runClass = cl.loadClass(className);
-                }
-
+                className = clazz.getName();
+                runClass = cl.loadClass(className);
                 methodToInvoke = getMainMethod(runClass);
                 group = new ThreadGroup(runClass.getSimpleName());
                 group.setDaemon(true);
 
             } else {
-                if (runClass == null) {
-                    throw new UnexpectedError("runClass is null in initMethod");
-                }
                 className = clazz.getName();
                 methodToInvoke = getMainMethod(runClass);
                 group = new ThreadGroup(runClass.getSimpleName());