Fixed issues with handling sample robots and test robots in the .sandbox folder.

Author: flemming-n-larsen

robocode.api/src/main/java/robocode/control/RobotTestBed.java

@@ -9,7 +9,6 @@
 
 
 import net.sf.robocode.io.Logger;
-
 import robocode.control.events.*;
 import robocode.control.snapshot.IRobotSnapshot;
 import robocode.robotinterfaces.IBasicRobot;
@@ -18,7 +17,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import static robocode.util.Utils.*;
+import static robocode.util.Utils.assertEquals;
+import static robocode.util.Utils.assertNotNull;
 
 
 /**
@@ -177,7 +177,7 @@ protected void beforeInit() {
         System.setProperty("robocode.options.battle.desiredTPS", "10000");
 
         try {
-            File robotsPathFile = new File("../.sandbox/robots").getCanonicalFile().getAbsoluteFile();
+            File robotsPathFile = new File("../.sandbox/test-robots").getCanonicalFile().getAbsoluteFile();
             robotsPath = robotsPathFile.getPath();
         } catch (IOException e) {
             e.printStackTrace(Logger.realErr);

robocode.samples/build.gradle.kts

@@ -25,19 +25,29 @@ tasks {
         into("../.sandbox/robots")
     }
 
-    val copyClasses by registering(Copy::class) {
-        from(compileJava)
+    val copyRobotClasses by registering(Copy::class) {
+        dependsOn(compileJava)
+
+        from("build/classes/java/main")
         into("../.sandbox/robots")
     }
 
+    val copyRobotClassesToTestRobots by registering(Copy::class) {
+        dependsOn(compileJava)
+
+        from("build/classes/java/main")
+        into("../.sandbox/test-robots")
+    }
+
     javadoc {
         source = sourceSets["main"].java
         include("**/*.java")
     }
 
     jar {
         dependsOn(copyContent)
-        dependsOn(copyClasses)
+        dependsOn(copyRobotClasses)
+        dependsOn(copyRobotClassesToTestRobots)
         dependsOn(javadoc)
 
         duplicatesStrategy = DuplicatesStrategy.INCLUDE

robocode.tests.robots/build.gradle.kts

@@ -15,19 +15,19 @@ tasks {
         from("src/main/resources") {
             include("**/*.*")
         }
-        into("../.sandbox/robots")
+        into("../.sandbox/test-robots")
     }
 
-    val copyClasses by registering(Copy::class) {
-        dependsOn(configurations.runtimeClasspath)
+    val copyRobotClasses by registering(Copy::class) {
+        dependsOn(compileJava)
 
-        from(compileJava)
-        into("../.sandbox/robots")
+        from("build/classes/java/main")
+        into("../.sandbox/test-robots")
     }
 
     jar {
         dependsOn(copyContent)
-        dependsOn(copyClasses)
+        dependsOn(copyRobotClasses)
     }
 }
 

robocode.tests/src/main/java/net/sf/robocode/test/helpers/RobocodeTestBed.java

@@ -10,8 +10,7 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Test;
-import robocode.control.*;
+import robocode.control.RobotTestBed;
 
 import java.io.File;
 

robocode.tests/src/test/java/net/sf/robocode/test/host/security/RobotClassLoaderTest.java

@@ -13,7 +13,6 @@
 import net.sf.robocode.host.security.RobotClassLoader;
 import net.sf.robocode.io.Logger;
 import net.sf.robocode.security.HiddenAccess;
-import net.sf.robocode.test.helpers.RobocodeTestBed;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -36,7 +35,7 @@ public class RobotClassLoaderTest {
 	public static void init() throws IOException {
 		HiddenAccess.initContainer();
 		try {
-			File robotsPathFile = new File("../.sandbox/robots").getCanonicalFile().getAbsoluteFile();
+			File robotsPathFile = new File("../.sandbox/test-robots").getCanonicalFile().getAbsoluteFile();
 			robotsPath = robotsPathFile.getPath();
 		} catch (IOException e) {
 			e.printStackTrace(Logger.realErr);