Formatting, make sure the tests use local instances of their data structures

michaelzhao820 · michaelzhao820 · commit 849d255dea09 · 2026-03-02T13:09:41.000-06:00
diff --git a/src/main/c/src/cypher_expression.cpp b/src/main/c/src/cypher_expression.cpp
@@ -82,7 +82,8 @@ jvalue LiteralExpr::getValue() {
             value.l = (jobject)agent->createNewString(this->value);
             return value;
         }
-        throw std::runtime_error("Unsupported literal type in LiteralExpr::getValue");
+        throw std::runtime_error(
+                "Unsupported literal type in LiteralExpr::getValue");
     }
 }
 Expression *LiteralExpr::evaluate(
diff --git a/src/main/c/src/jni_util.cpp b/src/main/c/src/jni_util.cpp
@@ -405,7 +405,8 @@ jvalue Agent::getInstancePrimitiveField(jobject instance,
         value.l = nullptr;
         return value;
     }
-    throw std::runtime_error("Unsupported field type in getInstancePrimitiveField");
+    throw std::runtime_error(
+            "Unsupported field type in getInstancePrimitiveField");
 }
 
 Agent::MethodReturnType Agent::getFieldType(const string &fieldDescriptor) {
@@ -417,7 +418,8 @@ Agent::MethodReturnType Agent::getFieldType(const string &fieldDescriptor) {
             JAVA_OBJECT_CREATION_TYPE_
 #undef ENTRY
         }
-        throw std::runtime_error("Unsupported single-character field descriptor");
+        throw std::runtime_error(
+                "Unsupported single-character field descriptor");
     } else if (fieldDescriptor == "Ljava/lang/String;") {
         return Agent::MethodReturnType::JSTRING;
     } else {
diff --git a/src/test/java/org/ogo/test/datastructuretests/ArrayDequeTest.java b/src/test/java/org/ogo/test/datastructuretests/ArrayDequeTest.java
@@ -13,24 +13,24 @@
 import org.junit.jupiter.api.Test;
 
 public class ArrayDequeTest extends DataStructureTest {
+    private ArrayDeque<Integer> dque1;
 
     @RepeatedTest(1)
     public void checkArrayDeque() throws RemoteException, InterruptedException {
         Thread.sleep(200);
         ThreadLocalRandom randGen = ThreadLocalRandom.current();
         int size = randGen.nextInt(10, 1000);
-        ArrayDeque<Integer> dque1 = ((randGen.ints(size, 0, 100000)).boxed())
-                .collect(Collectors.toCollection(ArrayDeque::new));
+        dque1 = ((randGen.ints(size, 0, 100000)).boxed()).collect(Collectors.toCollection(ArrayDeque::new));
         Integer item = randGen.nextInt(100, 100000);
-        boolean var1 = queryBool(this,
+        boolean var1 = queryBool(dque1,
                 "MATCH ({$1})-[:elements]->(m)-[*]->(n {value:" + item + "}) RETURN COUNT(n) <> 0", dque1);
         boolean var2 = OgoArrayDeque.contains(dque1, item, true, this);
         assertEquals(var1, var2);
     }
 
     @Test
     public void checkArrayDeque2() throws RemoteException {
-        ArrayDeque<Integer> dque1 = new ArrayDeque<>();
+        dque1 = new ArrayDeque<>();
         dque1.add(1);
         boolean var1 = OgoArrayDeque.contains(dque1, 0, false, this);
         boolean var2 = OgoArrayDeque.contains(dque1, 0, true, this);
@@ -42,7 +42,7 @@ public void checkArrayDeque2() throws RemoteException {
 
     @Test
     public void checkArrayDeque3() throws RemoteException {
-        ArrayDeque<Integer> dque1 = new ArrayDeque<>();
+        dque1 = new ArrayDeque<>();
         dque1.add(1);
         boolean var3 = OgoArrayDeque.contains(dque1, 1, false, this);
         boolean var4 = OgoArrayDeque.contains(dque1, 1, true, this);
diff --git a/src/test/java/org/ogo/test/datastructuretests/ArrayListTest.java b/src/test/java/org/ogo/test/datastructuretests/ArrayListTest.java
@@ -10,14 +10,14 @@
 import org.junit.jupiter.api.RepeatedTest;
 
 public class ArrayListTest extends DataStructureTest {
+    private ArrayList<Integer> list2;
 
     @RepeatedTest(1)
     public void checkArrayList() throws RemoteException, InterruptedException {
         Thread.sleep(200);
         ThreadLocalRandom randGen = ThreadLocalRandom.current();
         int size = 10;
-        ArrayList<Integer> list2 = ((randGen.ints(size, 0, 100000)).boxed())
-                .collect(Collectors.toCollection(ArrayList::new));
+        list2 = ((randGen.ints(size, 0, 100000)).boxed()).collect(Collectors.toCollection(ArrayList::new));
         Integer item = randGen.nextInt(100, 100000);
         boolean var1 = queryBool(this,
                 "MATCH ({$1})-[:elementData]->(m)-[*]->(n {value:" + item + "}) RETURN COUNT(n) <> 0", list2);
diff --git a/src/test/java/org/ogo/test/datastructuretests/DataStructureTest.java b/src/test/java/org/ogo/test/datastructuretests/DataStructureTest.java
@@ -4,7 +4,6 @@
 import java.rmi.NotBoundException;
 import org.junit.jupiter.api.BeforeAll;
 import org.ogo.client.OGO;
-import org.ogo.util.OGOProperties;
 
 public abstract class DataStructureTest {
     private static boolean queryEngineInitialized = false;
@@ -14,16 +13,16 @@ public abstract class DataStructureTest {
      */
     @BeforeAll
     public static void initQueryEngine() throws InterruptedException, IOException, NotBoundException {
-        if (!queryEngineInitialized) {
-            Thread.sleep(5000);
-            OGO.init();
-            OGO.setWhiteList("ogo/test", "java/util");
-            OGO.forceGC = true;
-            OGO.followRoot = true;
-            OGO.whitelist = true;
-            queryEngineInitialized = true;
-            OGO.clearDatabase = OGOProperties.getClearDatabase();
-
+        if (queryEngineInitialized) {
+            return;
         }
+        Thread.sleep(5000);
+        OGO.init();
+        OGO.setWhiteList("ogo/test", "java/util");
+        OGO.clearDatabase = true;
+        OGO.forceGC = true;
+        OGO.followRoot = true;
+        OGO.whitelist = true;
+        queryEngineInitialized = true;
     }
 }
diff --git a/src/test/java/org/ogo/test/datastructuretests/DirectedSparseGraphTest.java b/src/test/java/org/ogo/test/datastructuretests/DirectedSparseGraphTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.RepeatedTest;
 
 public class DirectedSparseGraphTest extends DataStructureTest {
+    private DirectedSparseGraph<Integer, Integer> jungdSparseGraph;
 
     @RepeatedTest(1)
     public void checkDirectedSparseGraph() throws RemoteException, InterruptedException {
@@ -21,7 +22,7 @@ public void checkDirectedSparseGraph() throws RemoteException, InterruptedExcept
                 .collect(Collectors.toCollection(ArrayList::new));
         ArrayList<Integer> temp2 = ((randGen.ints(size, 0, 100000)).boxed())
                 .collect(Collectors.toCollection(ArrayList::new));
-        DirectedSparseGraph<Integer, Integer> jungdSparseGraph = new DirectedSparseGraph<>();
+        jungdSparseGraph = new DirectedSparseGraph<>();
         for (int j = 0; j < temp.size(); j++) {
             jungdSparseGraph.addVertex(temp.get(j));
             jungdSparseGraph.addVertex(temp2.get(j));
diff --git a/src/test/java/org/ogo/test/datastructuretests/HashMapTest.java b/src/test/java/org/ogo/test/datastructuretests/HashMapTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.RepeatedTest;
 
 public class HashMapTest extends DataStructureTest {
+    private HashMap<Integer, Integer> map1;
 
     @RepeatedTest(1)
     public void checkHashMap() throws RemoteException, InterruptedException {
@@ -21,7 +22,7 @@ public void checkHashMap() throws RemoteException, InterruptedException {
                 .collect(Collectors.toCollection(ArrayList::new));
         ArrayList<Integer> temp2 = ((randGen.ints(size, 0, 100000)).boxed())
                 .collect(Collectors.toCollection(ArrayList::new));
-        HashMap<Integer, Integer> map1 = new HashMap<>();
+        map1 = new HashMap<>();
         for (int j = 0; j < temp.size(); j++) {
             map1.put(temp.get(j), temp2.get(j));
         }
diff --git a/src/test/java/org/ogo/test/datastructuretests/LinkedListTest.java b/src/test/java/org/ogo/test/datastructuretests/LinkedListTest.java
@@ -10,14 +10,14 @@
 import org.junit.jupiter.api.RepeatedTest;
 
 public class LinkedListTest extends DataStructureTest {
+    private LinkedList<Integer> list1;
 
     @RepeatedTest(1)
     public void checkLinkedList() throws RemoteException, InterruptedException {
         Thread.sleep(200);
         ThreadLocalRandom randGen = ThreadLocalRandom.current();
         int size = 5;
-        LinkedList<Integer> list1 = ((randGen.ints(size, 0, 100000)).boxed())
-                .collect(Collectors.toCollection(LinkedList::new));
+        list1 = ((randGen.ints(size, 0, 100000)).boxed()).collect(Collectors.toCollection(LinkedList::new));
         Integer item = randGen.nextInt(100, 100000);
         boolean var1 = queryBool(this, "MATCH ({$1})-[:first]->(m)-[*]->(n {value:" + item + "}) RETURN COUNT(n) <> 0",
                 list1);
diff --git a/src/test/java/org/ogo/test/datastructuretests/OgoArrayDeque.java b/src/test/java/org/ogo/test/datastructuretests/OgoArrayDeque.java
@@ -12,7 +12,7 @@ public static boolean contains(ArrayDeque deque, Integer item, boolean defaultMo
         if (defaultMode) {
             return deque.contains(item);
         } else {
-            return queryBool(test,
+            return queryBool(deque,
                     "MATCH ({$1})-[:elements]->(m)-[*]->(n {value:" + item.intValue() + "}) RETURN COUNT(n) <> 0",
                     deque);
         }
diff --git a/src/test/java/org/ogo/test/datastructuretests/SparseGraphTest.java b/src/test/java/org/ogo/test/datastructuretests/SparseGraphTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.RepeatedTest;
 
 public class SparseGraphTest extends DataStructureTest {
+    private SparseGraph<Integer, Integer> jungSparseGraph;
 
     @RepeatedTest(1)
     public void checkSparseGraph() throws RemoteException, InterruptedException {
@@ -21,7 +22,7 @@ public void checkSparseGraph() throws RemoteException, InterruptedException {
                 .collect(Collectors.toCollection(ArrayList::new));
         ArrayList<Integer> temp2 = ((randGen.ints(size, 0, 100000)).boxed())
                 .collect(Collectors.toCollection(ArrayList::new));
-        SparseGraph<Integer, Integer> jungSparseGraph = new SparseGraph<>();
+        jungSparseGraph = new SparseGraph<>();
         for (int j = 0; j < temp.size(); j++) {
             jungSparseGraph.addVertex(temp.get(j));
             jungSparseGraph.addVertex(temp2.get(j));
diff --git a/src/test/java/org/ogo/test/datastructuretests/UndirectedSparseGraphTest.java b/src/test/java/org/ogo/test/datastructuretests/UndirectedSparseGraphTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.RepeatedTest;
 
 public class UndirectedSparseGraphTest extends DataStructureTest {
+    private UndirectedSparseGraph<Integer, Integer> jungudSparseGraph;
 
     @RepeatedTest(1)
     public void checkUndirectedSparseGraph() throws RemoteException, InterruptedException {
@@ -21,7 +22,7 @@ public void checkUndirectedSparseGraph() throws RemoteException, InterruptedExce
                 .collect(Collectors.toCollection(ArrayList::new));
         ArrayList<Integer> temp2 = ((randGen.ints(size, 0, 100000)).boxed())
                 .collect(Collectors.toCollection(ArrayList::new));
-        UndirectedSparseGraph<Integer, Integer> jungudSparseGraph = new UndirectedSparseGraph<>();
+        jungudSparseGraph = new UndirectedSparseGraph<>();
         for (int j = 0; j < temp.size(); j++) {
             jungudSparseGraph.addVertex(temp.get(j));
             jungudSparseGraph.addVertex(temp2.get(j));
diff --git a/src/test/java/org/ogo/test/datastructuretests/VectorTest.java b/src/test/java/org/ogo/test/datastructuretests/VectorTest.java
@@ -10,14 +10,14 @@
 import org.junit.jupiter.api.RepeatedTest;
 
 public class VectorTest extends DataStructureTest {
+    private Vector<Integer> vector1;
 
     @RepeatedTest(1)
     public void checkVector() throws RemoteException, InterruptedException {
         Thread.sleep(200);
         ThreadLocalRandom randGen = ThreadLocalRandom.current();
         int size = randGen.nextInt(10, 500);
-        Vector<Integer> vector1 = ((randGen.ints(size, 0, 100000)).boxed())
-                .collect(Collectors.toCollection(Vector::new));
+        vector1 = ((randGen.ints(size, 0, 100000)).boxed()).collect(Collectors.toCollection(Vector::new));
         Integer item = randGen.nextInt(100, 100000);
         boolean var1 = queryBool(this,
                 "MATCH ({$1})-[:elementData]->(m)-[*]->(n {value:" + item + "}) RETURN COUNT(n) <> 0", vector1);

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ jvalue LiteralExpr::getValue() {`
`82`	`82`	`value.l = (jobject)agent->createNewString(this->value);`
`83`	`83`	`return value;`
`84`	`84`	`}`
`85`		`- throw std::runtime_error("Unsupported literal type in LiteralExpr::getValue");`
	`85`	`+ throw std::runtime_error(`
	`86`	`+ "Unsupported literal type in LiteralExpr::getValue");`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`	`Expression *LiteralExpr::evaluate(`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,8 @@ jvalue Agent::getInstancePrimitiveField(jobject instance,`
`405`	`405`	`value.l = nullptr;`
`406`	`406`	`return value;`
`407`	`407`	`}`
`408`		`- throw std::runtime_error("Unsupported field type in getInstancePrimitiveField");`
	`408`	`+ throw std::runtime_error(`
	`409`	`+ "Unsupported field type in getInstancePrimitiveField");`
`409`	`410`	`}`
`410`	`411`
`411`	`412`	`Agent::MethodReturnType Agent::getFieldType(const string &fieldDescriptor) {`
`@@ -417,7 +418,8 @@ Agent::MethodReturnType Agent::getFieldType(const string &fieldDescriptor) {`
`417`	`418`	`JAVA_OBJECT_CREATION_TYPE_`
`418`	`419`	`#undef ENTRY`
`419`	`420`	`}`
`420`		`- throw std::runtime_error("Unsupported single-character field descriptor");`
	`421`	`+ throw std::runtime_error(`
	`422`	`+ "Unsupported single-character field descriptor");`
`421`	`423`	`} else if (fieldDescriptor == "Ljava/lang/String;") {`
`422`	`424`	`return Agent::MethodReturnType::JSTRING;`
`423`	`425`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public static boolean contains(ArrayDeque deque, Integer item, boolean defaultMo`
`12`	`12`	`if (defaultMode) {`
`13`	`13`	`return deque.contains(item);`
`14`	`14`	`} else {`
`15`		`- return queryBool(test,`
	`15`	`+ return queryBool(deque,`
`16`	`16`	`"MATCH ({$1})-[:elements]->(m)-[*]->(n {value:" + item.intValue() + "}) RETURN COUNT(n) <> 0",`
`17`	`17`	`deque);`
`18`	`18`	`}`