diff --git a/tests/edu/caltech/cs2/helpers/Inspection.java b/tests/edu/caltech/cs2/helpers/Inspection.java index 1138ab770ec04d164f9d3bf9f71c4d8dc94d25c0..53079f9e90fbae2dd4edc2d85834cc1b25cc9062 100644 --- a/tests/edu/caltech/cs2/helpers/Inspection.java +++ b/tests/edu/caltech/cs2/helpers/Inspection.java @@ -24,8 +24,8 @@ import java.util.List; public class Inspection { - private static String arrayRegex1 = "\\s*int\\s*\\[\\]\\s*.*\\s*=\\s*new int\\[.*\\]\\s*;"; - private static String arrayRegex2 = ".*\\s*=\\s*new int\\[.*\\]\\s*;"; + private static String arrayRegex1 = "\\s*.*\\s*\\[\\]\\s*.*\\s*=\\s*new .*\\[.*\\]\\s*;"; + private static String arrayRegex2 = ".*\\s*=\\s*new .*\\[.*\\]\\s*;"; private static String getUsageOf(List<String> regexps, List<? extends Node> codeObjects) { for (Node d : codeObjects) { diff --git a/tests/edu/caltech/cs2/lab08/Problem1Tests.java b/tests/edu/caltech/cs2/lab08/Problem1Tests.java index 42ffb43bdbe1621ee43e9d477216553b73ac27c5..1c0890a1e0c0ee7b522215f909c739cf55af7179 100644 --- a/tests/edu/caltech/cs2/lab08/Problem1Tests.java +++ b/tests/edu/caltech/cs2/lab08/Problem1Tests.java @@ -37,7 +37,7 @@ public class Problem1Tests { @DisplayName("Import Tests") @Test public void testForInvalidClasses() { - List<String> regexps = List.of("java\\.lang\\.reflect", "java\\.io", "javax\\.swing", "java\\.util","\\s*int\\s*\\[\\]\\s*.*\\s*=\\s*new int\\[.*\\]\\s*;", ".*\\s*=\\s*new int\\[.*\\]\\s*;"); + List<String> regexps = List.of("java\\.lang\\.reflect", "java\\.io", "javax\\.swing", "java\\.util","\\s*.*\\s*\\[\\]\\s*.*\\s*=\\s*new .*\\[.*\\]\\s*;", ".*\\s*=\\s*new .*\\[.*\\]\\s*;"); Inspection.assertNoImportsOf(PROBLEM_1_SOURCE, regexps); Inspection.assertNoUsageOf(PROBLEM_1_SOURCE, regexps); } diff --git a/tests/edu/caltech/cs2/lab08/Problem2Tests.java b/tests/edu/caltech/cs2/lab08/Problem2Tests.java index 821bd4cae7ddce33f285a69a9d3ce1ce8f9206cc..32f46883f36baf7cf8ad865b3d045fb8683d2bf2 100644 --- a/tests/edu/caltech/cs2/lab08/Problem2Tests.java +++ b/tests/edu/caltech/cs2/lab08/Problem2Tests.java @@ -20,7 +20,7 @@ public class Problem2Tests { @DisplayName("Import & Usage Tests") @Test public void testForInvalidClassesAndDataStructures() { - List<String> regexps = List.of("java\\.lang\\.reflect", "java\\.io", "javax\\.swing", "java\\.util","\\s*int\\s*\\[\\]\\s*.*\\s*=\\s*new int\\[.*\\]\\s*;", ".*\\s*=\\s*new int\\[.*\\]\\s*;"); + List<String> regexps = List.of("java\\.lang\\.reflect", "java\\.io", "javax\\.swing", "java\\.util","\\s*.*\\s*\\[\\]\\s*.*\\s*=\\s*new .*\\[.*\\]\\s*;", ".*\\s*=\\s*new .*\\[.*\\]\\s*;"); Inspection.assertNoImportsOf(PROBLEM_2_SOURCE, regexps); Inspection.assertNoUsageOf(PROBLEM_2_SOURCE, regexps); }