Move tests to graderPrivate

.gitignore

@@ -81,3 +81,6 @@ out/
 gradle-app.setting
 !gradle-wrapper.jar
 .gradletasknamecache
+
+### Jagr ###
+jagr.conf

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-algoutils = "0.7.0-SNAPSHOT"
+algoutils = "0.7.2"
 
 [plugins]
 style = { id = "org.sourcegrade.style", version = "2.1.0" }
-jagr-gradle = { id = "org.sourcegrade.jagr-gradle", version = "0.10.1" }
+jagr-gradle = { id = "org.sourcegrade.jagr-gradle", version = "0.10.2" }
 
 [libraries]
 annotations = "org.jetbrains:annotations:23.0.0"

src/graderPublic/java/h06/H1_DirectionVectorTest.java → src/graderPrivate/java/h06/H1_DirectionVectorTest.java

@@ -2,8 +2,11 @@
 
 import h06.world.DirectionVector;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junitpioneer.jupiter.json.JsonClasspathSource;
 import org.junitpioneer.jupiter.json.Property;
@@ -18,6 +21,7 @@
 import spoon.reflect.declaration.CtElement;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static h06.TutorUtils.getMethodLink;
 import static h06.TutorUtils.getTypeLink;
@@ -32,7 +36,13 @@
  * @author Nhan Huynh
  */
 @DisplayName("H1 | DirectionVector")
+@TestMethodOrder(MethodOrderer.DisplayName.class)
 @TestForSubmission
+@Timeout(
+    value = TestConstants.TEST_TIMEOUT_IN_SECONDS,
+    unit = TimeUnit.SECONDS,
+    threadMode = Timeout.ThreadMode.SEPARATE_THREAD
+)
 public class H1_DirectionVectorTest {
 
     /**

src/graderPublic/java/h06/H2_WorldTest.java → src/graderPrivate/java/h06/H2_WorldTest.java

@@ -3,6 +3,9 @@
 import h06.world.DirectionVector;
 import h06.world.World;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junitpioneer.jupiter.json.JsonClasspathSource;
 import org.junitpioneer.jupiter.json.Property;
@@ -13,6 +16,7 @@
 import org.tudalgo.algoutils.tutor.general.reflections.MethodLink;
 
 import java.awt.Point;
+import java.util.concurrent.TimeUnit;
 
 import static h06.TutorUtils.buildWorldContext;
 import static h06.TutorUtils.getMethodLink;
@@ -25,7 +29,13 @@
  * @see H1_DirectionVectorTest
  */
 @DisplayName("H2 | World")
+@TestMethodOrder(MethodOrderer.DisplayName.class)
 @TestForSubmission
+@Timeout(
+    value = TestConstants.TEST_TIMEOUT_IN_SECONDS,
+    unit = TimeUnit.SECONDS,
+    threadMode = Timeout.ThreadMode.SEPARATE_THREAD
+)
 public class H2_WorldTest {
 
     /**

src/graderPublic/java/h06/H3_MazeSolverRecursiveTest.java → src/graderPrivate/java/h06/H3_MazeSolverRecursiveTest.java

@@ -7,8 +7,11 @@
 import h06.world.DirectionVector;
 import h06.world.World;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junitpioneer.jupiter.json.JsonClasspathSource;
 import org.junitpioneer.jupiter.json.Property;
@@ -30,6 +33,7 @@
 import java.awt.Point;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -49,6 +53,12 @@
  */
 @DisplayName("H3 | MazeSolverRecursive")
 @TestForSubmission
+@TestMethodOrder(MethodOrderer.DisplayName.class)
+@Timeout(
+    value = TestConstants.TEST_TIMEOUT_IN_SECONDS,
+    unit = TimeUnit.SECONDS,
+    threadMode = Timeout.ThreadMode.SEPARATE_THREAD
+)
 public class H3_MazeSolverRecursiveTest {
 
     /**

src/graderPublic/java/h06/H4_MazeSolverIterativeTest.java → src/graderPrivate/java/h06/H4_MazeSolverIterativeTest.java

@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junitpioneer.jupiter.json.JsonClasspathSource;
 import org.junitpioneer.jupiter.json.Property;
@@ -27,6 +28,7 @@
 import java.awt.Point;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static h06.TutorUtils.assertIterative;
 import static h06.TutorUtils.buildWorldContext;
@@ -42,6 +44,11 @@
 @DisplayName("H4 | MazeSolverIterative")
 @TestMethodOrder(MethodOrderer.DisplayName.class)
 @TestForSubmission
+@Timeout(
+    value = TestConstants.TEST_TIMEOUT_IN_SECONDS,
+    unit = TimeUnit.SECONDS,
+    threadMode = Timeout.ThreadMode.SEPARATE_THREAD
+)
 public class H4_MazeSolverIterativeTest {
 
     /**

src/graderPrivate/java/h06/TestConstants.java

@@ -0,0 +1,12 @@
+package h06;
+
+/**
+ * Constants for testing.
+ */
+public class TestConstants {
+
+    /**
+     * The timeout for each test in seconds.
+     */
+    public static final int TEST_TIMEOUT_IN_SECONDS = 2;
+}

src/graderPrivate/resources/DirectionVector/rotate270/down.json

@@ -0,0 +1,4 @@
+{
+  "input": "DOWN",
+  "expected": "RIGHT"
+}

src/graderPrivate/resources/DirectionVector/rotate270/left.json

@@ -0,0 +1,4 @@
+{
+  "input": "LEFT",
+  "expected": "DOWN"
+}

src/graderPrivate/resources/DirectionVector/rotate270/right.json

@@ -0,0 +1,4 @@
+{
+  "input": "RIGHT",
+  "expected": "UP"
+}

src/graderPrivate/resources/DirectionVector/rotate270/up.json

@@ -0,0 +1,4 @@
+{
+  "input": "UP",
+  "expected": "LEFT"
+}

src/graderPrivate/resources/DirectionVector/rotate90/down.json

@@ -0,0 +1,4 @@
+{
+  "input": "DOWN",
+  "expected": "LEFT"
+}

src/graderPrivate/resources/DirectionVector/rotate90/left.json

@@ -0,0 +1,4 @@
+{
+  "input": "LEFT",
+  "expected": "UP"
+}

src/graderPrivate/resources/DirectionVector/rotate90/right.json

@@ -0,0 +1,4 @@
+{
+  "input": "RIGHT",
+  "expected": "DOWN"
+}

src/graderPrivate/resources/DirectionVector/rotate90/up.json

@@ -0,0 +1,4 @@
+{
+  "input": "UP",
+  "expected": "RIGHT"
+}

src/graderPrivate/resources/MazeSolver/nextStep/down.json

@@ -0,0 +1,28 @@
+{
+  "properties": {
+    "height": 3,
+    "width": 3,
+    "horizontal": [
+      {
+        "x": 1,
+        "y": 1
+      }
+    ],
+    "vertical": [
+      {
+        "x": 0,
+        "y": 1
+      },
+      {
+        "x": 1,
+        "y": 1
+      }
+    ]
+  },
+  "p": {
+    "x": 1,
+    "y": 1
+  },
+  "d": "LEFT",
+  "expected": "DOWN"
+}

src/graderPrivate/resources/MazeSolver/nextStep/down_complex.json

@@ -0,0 +1,24 @@
+{
+  "properties": {
+    "height": 3,
+    "width": 3,
+    "horizontal": [
+      {
+        "x": 1,
+        "y": 1
+      }
+    ],
+    "vertical": [
+      {
+        "x": 1,
+        "y": 1
+      }
+    ]
+  },
+  "p": {
+    "x": 1,
+    "y": 1
+  },
+  "d": "RIGHT",
+  "expected": "DOWN"
+}

src/graderPrivate/resources/MazeSolver/nextStep/left.json

@@ -0,0 +1,28 @@
+{
+  "properties": {
+    "height": 3,
+    "width": 3,
+    "horizontal": [
+      {
+        "x": 1,
+        "y": 0
+      },
+      {
+        "x": 1,
+        "y": 1
+      }
+    ],
+    "vertical": [
+      {
+        "x": 1,
+        "y": 1
+      }
+    ]
+  },
+  "p": {
+    "x": 1,
+    "y": 1
+  },
+  "d": "UP",
+  "expected": "LEFT"
+}

src/graderPrivate/resources/MazeSolver/nextStep/left_complex.json

@@ -0,0 +1,24 @@
+{
+  "properties": {
+    "height": 3,
+    "width": 3,
+    "horizontal": [
+      {
+        "x": 1,
+        "y": 0
+      }
+    ],
+    "vertical": [
+      {
+        "x": 1,
+        "y": 1
+      }
+    ]
+  },
+  "p": {
+    "x": 1,
+    "y": 1
+  },
+  "d": "DOWN",
+  "expected": "LEFT"
+}

src/graderPrivate/resources/MazeSolver/nextStep/right.json

@@ -0,0 +1,28 @@
+{
+  "properties": {
+    "height": 3,
+    "width": 3,
+    "horizontal": [
+      {
+        "x": 1,
+        "y": 0
+      },
+      {
+        "x": 1,
+        "y": 1
+      }
+    ],
+    "vertical": [
+      {
+        "x": 0,
+        "y": 1
+      }
+    ]
+  },
+  "p": {
+    "x": 1,
+    "y": 1
+  },
+  "d": "DOWN",
+  "expected": "RIGHT"
+}

src/graderPrivate/resources/MazeSolver/nextStep/right_complex.json

@@ -0,0 +1,24 @@
+{
+  "properties": {
+    "height": 3,
+    "width": 3,
+    "horizontal": [
+      {
+        "x": 1,
+        "y": 1
+      }
+    ],
+    "vertical": [
+      {
+        "x": 0,
+        "y": 1
+      }
+    ]
+  },
+  "p": {
+    "x": 1,
+    "y": 1
+  },
+  "d": "UP",
+  "expected": "RIGHT"
+}

src/graderPrivate/resources/MazeSolver/nextStep/up.json

@@ -0,0 +1,28 @@
+{
+  "properties": {
+    "height": 3,
+    "width": 3,
+    "horizontal": [
+      {
+        "x": 1,
+        "y": 0
+      }
+    ],
+    "vertical": [
+      {
+        "x": 0,
+        "y": 1
+      },
+      {
+        "x": 1,
+        "y": 1
+      }
+    ]
+  },
+  "p": {
+    "x": 1,
+    "y": 1
+  },
+  "d": "RIGHT",
+  "expected": "UP"
+}