From 82fb4a519385fecfddc126af1e0916e77a2d30d3 Mon Sep 17 00:00:00 2001
From: Snigdha Saha <snigdhas2572@gmail.com>
Date: Thu, 3 Mar 2022 17:46:34 -0800
Subject: [PATCH] test update
---
tests/edu/caltech/cs2/helpers/Inspection.java | 4 ++--
tests/edu/caltech/cs2/lab08/Problem1Tests.java | 2 +-
tests/edu/caltech/cs2/lab08/Problem2Tests.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/edu/caltech/cs2/helpers/Inspection.java b/tests/edu/caltech/cs2/helpers/Inspection.java
index 1138ab7..53079f9 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 42ffb43..1c0890a 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 821bd4c..32f4688 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);
}
--
GitLab