diff --git a/estore/src/main/java/org/estore/Estore.java b/estore/src/main/java/org/estore/Estore.java index 0e9a226..e873f50 100644 --- a/estore/src/main/java/org/estore/Estore.java +++ b/estore/src/main/java/org/estore/Estore.java @@ -61,11 +61,11 @@ public HashMap getLabelClassInfoMap() { return labelClassInfoMap; } - public Estore(String name) throws Exception { + public Estore(String name) { this(name, EstoreOptions.getDefaultOptions()); } - public Estore(String name, EstoreOptions options) throws Exception { + public Estore(String name, EstoreOptions options) { this.name = name; this.options = options; this.id = 0; diff --git a/estore/src/main/java/org/estore/compiler/ImplCodeGen.java b/estore/src/main/java/org/estore/compiler/ImplCodeGen.java index 9e01f8c..a7eac52 100644 --- a/estore/src/main/java/org/estore/compiler/ImplCodeGen.java +++ b/estore/src/main/java/org/estore/compiler/ImplCodeGen.java @@ -9,6 +9,7 @@ import com.github.javaparser.ast.expr.MethodCallExpr; import com.github.javaparser.ast.visitor.VoidVisitorAdapter; import java.io.File; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import org.antlr.v4.runtime.CharStreams; @@ -133,7 +134,7 @@ private static String getDefaultOutputFilePath(String inputFilePath) { return Paths.get(parentDir, "Transformed" + fileName).toString(); } - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws IOException { String inputFilePath = args.length > 0 ? args[0] : DEFAULT_INPUT_FILE_PATH; String outputFilePath = args.length > 1 ? args[1] : getDefaultOutputFilePath(inputFilePath); CompilationUnit cu = StaticJavaParser.parse(Files.newInputStream(Paths.get(inputFilePath))); diff --git a/estore/src/main/java/org/estore/planner/LogicalPlanBuilder.java b/estore/src/main/java/org/estore/planner/LogicalPlanBuilder.java index 34bd264..66c2a45 100644 --- a/estore/src/main/java/org/estore/planner/LogicalPlanBuilder.java +++ b/estore/src/main/java/org/estore/planner/LogicalPlanBuilder.java @@ -604,6 +604,14 @@ public Object visitOC_MapLiteral(CypherParser.OC_MapLiteralContext ctx) { return null; } + @Override + public Object visitOC_Atom(CypherParser.OC_AtomContext ctx) { + if (ctx.COUNT() != null) { + return new CountFunctionExpr(); + } + return visitChildren(ctx); + } + @Override public Object visitOC_FunctionInvocation(CypherParser.OC_FunctionInvocationContext ctx) { LogicalExpr expr = null; diff --git a/estore/src/main/java/org/estore/planner/expressions/function/CountFunctionSingleExpr.java b/estore/src/main/java/org/estore/planner/expressions/function/CountFunctionSingleExpr.java index 00999d6..7a58a44 100644 --- a/estore/src/main/java/org/estore/planner/expressions/function/CountFunctionSingleExpr.java +++ b/estore/src/main/java/org/estore/planner/expressions/function/CountFunctionSingleExpr.java @@ -20,14 +20,17 @@ public CountFunctionSingleExpr(CountFunctionExpr expr) { @Override public Table evaluate(Table v) { + String keyName = getName(); + Table result = new Table(Arrays.asList(new String[] {keyName})); if (arg instanceof VarExpr) { - String keyName = getName(); - Table result = new Table(Arrays.asList(new String[] {keyName})); String variable = ((VarExpr) arg).evaluate(null); - result.get(keyName).add(v.get(variable).size()); return result; } + if (arg == null) { + result.get(keyName).add(v.getSize()); + return result; + } return null; } diff --git a/estore/src/test/java/org/estore/AggregateFunctionTest.java b/estore/src/test/java/org/estore/AggregateFunctionTest.java index c6574a7..59c98b6 100644 --- a/estore/src/test/java/org/estore/AggregateFunctionTest.java +++ b/estore/src/test/java/org/estore/AggregateFunctionTest.java @@ -11,7 +11,7 @@ public class AggregateFunctionTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() throws EstoreException { db = new Estore(AggregateFunctionTest.class.getName()); Person c = new Person("C", 30); Person b = new Person("B", 40, c); @@ -20,25 +20,25 @@ void setUp() throws Exception { } @Test - void maxReturnsLargestAge() throws Exception { + void maxReturnsLargestAge() { Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN max(p.age)"); assertEquals(40, result.get("MAX(p.age)").get(0)); } @Test - void minReturnsSmallestAge() throws Exception { + void minReturnsSmallestAge() { Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN min(p.age)"); assertEquals(20, result.get("MIN(p.age)").get(0)); } @Test - void sumReturnsTotalAge() throws Exception { + void sumReturnsTotalAge() { Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN sum(p.age)"); assertEquals(90, result.get("SUM(p.age)").get(0)); } @Test - void avgReturnsMeanAge() throws Exception { + void avgReturnsMeanAge() { Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN avg(p.age)"); assertEquals(30.0, result.get("AVG(p.age)").get(0)); } diff --git a/estore/src/test/java/org/estore/AnonymousRelationTest.java b/estore/src/test/java/org/estore/AnonymousRelationTest.java index 8873a99..8861e4d 100644 --- a/estore/src/test/java/org/estore/AnonymousRelationTest.java +++ b/estore/src/test/java/org/estore/AnonymousRelationTest.java @@ -11,12 +11,12 @@ public class AnonymousRelationTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() { db = new Estore(AnonymousRelationTest.class.getName()); } @Test - void bareArrowMatchesEmptyBrackets() throws Exception { + void bareArrowMatchesEmptyBrackets() throws EstoreException { Person bob = new Person("Bob", 30); Person alice = new Person("Alice", 28, bob); db.captureAll(alice); diff --git a/estore/src/test/java/org/estore/ArithmeticTest.java b/estore/src/test/java/org/estore/ArithmeticTest.java index af511cd..645892e 100644 --- a/estore/src/test/java/org/estore/ArithmeticTest.java +++ b/estore/src/test/java/org/estore/ArithmeticTest.java @@ -10,12 +10,12 @@ public class ArithmeticTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() { db = new Estore(ArithmeticTest.class.getName()); } @Test - void fourOperationsAndCountDivide() throws Exception { + void fourOperationsAndCountDivide() { db.query("CREATE (n:`ArithNode`)"); db.query("CREATE (n:`ArithNode`)"); diff --git a/estore/src/test/java/org/estore/CaptureModeTest.java b/estore/src/test/java/org/estore/CaptureModeTest.java new file mode 100644 index 0000000..a4481d1 --- /dev/null +++ b/estore/src/test/java/org/estore/CaptureModeTest.java @@ -0,0 +1,49 @@ +package org.estore; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.estore.example.Person; +import org.estore.planner.util.Table; +import org.junit.jupiter.api.Test; + +public class CaptureModeTest { + + @Test + void iterativeDfsCapturesPersonChain() throws EstoreException { + Estore db = new Estore(CaptureModeTest.class.getName(), new EstoreOptions().useDfs(true)); + Person charlie = new Person("Charlie", 25); + Person bob = new Person("Bob", 30, charlie); + Person alice = new Person("Alice", 28, bob); + db.captureAll(alice); + + Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN p"); + assertEquals(3, result.getSize()); + } + + @Test + void recursiveDfsCapturesPersonChain() throws EstoreException { + Estore db = + new Estore( + CaptureModeTest.class.getName(), + new EstoreOptions().useDfs(true).useRecursion(true)); + Person charlie = new Person("Charlie", 25); + Person bob = new Person("Bob", 30, charlie); + Person alice = new Person("Alice", 28, bob); + db.captureAll(alice); + + Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN p"); + assertEquals(3, result.getSize()); + } + + @Test + void depthLimitedCaptureStops() throws EstoreException { + Estore db = new Estore(CaptureModeTest.class.getName()); + Person charlie = new Person("Charlie", 25); + Person bob = new Person("Bob", 30, charlie); + Person alice = new Person("Alice", 28, bob); + db.captureAll(alice, 2, 0); + + Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN p"); + assertEquals(2, result.getSize()); + } +} diff --git a/estore/src/test/java/org/estore/CaseExpressionTest.java b/estore/src/test/java/org/estore/CaseExpressionTest.java index 3b36faf..41c7630 100644 --- a/estore/src/test/java/org/estore/CaseExpressionTest.java +++ b/estore/src/test/java/org/estore/CaseExpressionTest.java @@ -11,13 +11,13 @@ public class CaseExpressionTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() throws EstoreException { db = new Estore(CaseExpressionTest.class.getName()); db.captureAll(new Person("A", 20)); } @Test - void caseReturnsElseWhenPredicateIsFalse() throws Exception { + void caseReturnsElseWhenPredicateIsFalse() { Table result = db.query( "MATCH (p:`org.estore.example.Person`) RETURN CASE WHEN p.age > 25 THEN 1 ELSE 0 END"); @@ -25,10 +25,26 @@ void caseReturnsElseWhenPredicateIsFalse() throws Exception { } @Test - void caseReturnsThenWhenPredicateIsTrue() throws Exception { + void caseReturnsThenWhenPredicateIsTrue() { Table result = db.query( "MATCH (p:`org.estore.example.Person`) RETURN CASE WHEN p.age > 15 THEN 1 ELSE 0 END"); assertEquals(1L, result.get("CASE").get(0)); } + + @Test + void caseMatchesSubject() { + Table result = + db.query( + "MATCH (p:`org.estore.example.Person`) RETURN CASE p.name WHEN 'A' THEN 1 ELSE 0 END"); + assertEquals(1L, result.get("CASE").get(0)); + } + + @Test + void caseWithoutElseIsNullWhenNoWhenMatches() { + Table result = + db.query( + "MATCH (p:`org.estore.example.Person`) RETURN CASE WHEN p.age > 99 THEN 1 END"); + assertEquals(null, result.get("CASE").get(0)); + } } diff --git a/estore/src/test/java/org/estore/CountDistinctTest.java b/estore/src/test/java/org/estore/CountDistinctTest.java index 370f09d..702e122 100644 --- a/estore/src/test/java/org/estore/CountDistinctTest.java +++ b/estore/src/test/java/org/estore/CountDistinctTest.java @@ -11,12 +11,12 @@ public class CountDistinctTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() { db = new Estore(CountDistinctTest.class.getName()); } @Test - void countDistinctIsOneWhenCountIsTwo() throws Exception { + void countDistinctIsOneWhenCountIsTwo() throws EstoreException { // Keanu -> Carrie -> Guy // Keanu -> Liam -> Guy Person guy = new Person("Guy", 40); diff --git a/estore/src/test/java/org/estore/CreateInstanceTest.java b/estore/src/test/java/org/estore/CreateInstanceTest.java index 76ea990..3f6bc9c 100644 --- a/estore/src/test/java/org/estore/CreateInstanceTest.java +++ b/estore/src/test/java/org/estore/CreateInstanceTest.java @@ -27,13 +27,7 @@ public class CreateInstanceTest { @BeforeEach public void initDatabase() { - try { - estore = - new Estore( - CreateInstanceTest.class.getName(), new EstoreOptions().useDfs(false)); - } catch (Exception e) { - e.printStackTrace(); - } + estore = new Estore(CreateInstanceTest.class.getName(), new EstoreOptions().useDfs(false)); } /* @@ -47,7 +41,7 @@ public void initDatabase() { * } * * @RepeatedTest(50) - * void testNodeAddPropertyESTOREEval() throws Exception { + * void testNodeAddPropertyESTOREEval() { * long t1 = System.currentTimeMillis(); * estore.add(A.class); */ @@ -67,7 +61,7 @@ public void initDatabase() { * } * * @Test - * void createDropNodeLongStringPropertyESTOREEval() throws Exception { + * void createDropNodeLongStringPropertyESTOREEval() { * String testPropertyKey = "testProperty"; * String propertyValue = RandomStringUtils.randomAlphanumeric(255); * @@ -82,7 +76,7 @@ public void initDatabase() { * } * * @Test - * void createObjectWithJ() throws Exception { + * void createObjectWithJ() { * estore.add("create (n: `Val` {value: 30}) return n"); * Object[] objs = estore.query(true, "match (n: `Val`) return n"); * @@ -95,7 +89,7 @@ public void initDatabase() { * } * * @Test - * void createObjectWithD() throws Exception { + * void createObjectWithD() { * estore.add("create (n: `Val` {value: 30.0}) return n"); * Object[] objs = estore.query(true, "match (n: `Val`) return n"); * @@ -108,7 +102,7 @@ public void initDatabase() { * } * * @Test - * void createObjectWithString() throws Exception { + * void createObjectWithString() { * estore.add("create (n: `Val` {value: 'something'}) return n"); * Object[] objs = estore.query(true, "match (n: `Val`) return n"); * @@ -122,7 +116,7 @@ public void initDatabase() { * } * * @Test - * void createObjectWithManyTypes() throws Exception { + * void createObjectWithManyTypes() { * estore.add("create (n: `Val` {i: 30, d: 30.0, s: 'something'}) return n"); * Object[] objs = estore.query(true, "match (n: `Val`) return n"); * @@ -422,7 +416,7 @@ void testNodeAddPropertyCypher() { } @Test - void testNodeAddPropertyCypher2() throws Exception { + void testNodeAddPropertyCypher2() throws ReflectiveOperationException { Table result = estore.query("CREATE (n:`DummyClass3` {name:'Uki', age:30}) RETURN n"); Object obj = result.get("n").get(0); Class objClass = obj.getClass(); @@ -433,7 +427,7 @@ void testNodeAddPropertyCypher2() throws Exception { } @Test - void testArrayList() throws Exception { + void testArrayList() throws EstoreException { ArrayList a = new ArrayList(); a.add(10L); a.add(20L); @@ -447,7 +441,7 @@ void testArrayList() throws Exception { } @Test - void testLinkedList() throws Exception { + void testLinkedList() throws EstoreException { LinkedList a = new LinkedList(); ThreadLocalRandom rand = ThreadLocalRandom.current(); for (long j = 0; j < 10000; j++) { @@ -465,7 +459,7 @@ void testLinkedList() throws Exception { } @Test - void testLinkedList2() throws Exception { + void testLinkedList2() throws EstoreException { LinkedList a = new LinkedList(); ThreadLocalRandom rand = ThreadLocalRandom.current(); for (int j = 0; j < 100000; j++) { @@ -485,7 +479,7 @@ void testLinkedList2() throws Exception { } @Test - void testLinkedList3() throws Exception { + void testLinkedList3() throws EstoreException { LinkedList a = new LinkedList(); ThreadLocalRandom rand = ThreadLocalRandom.current(); for (int j = 0; j < 50; j++) { @@ -504,7 +498,7 @@ void testLinkedList3() throws Exception { } @Test - void testArrayDeque() throws Exception { + void testArrayDeque() throws EstoreException { ArrayDeque a = new ArrayDeque(); a.add(10L); a.add(20L); @@ -537,7 +531,7 @@ void testArrayListIteration() { } @Test - void testVector() throws Exception { + void testVector() throws EstoreException { Vector a = new Vector(); a.add(10L); a.add(20L); @@ -550,7 +544,7 @@ void testVector() throws Exception { } @Test - void testHashMap() throws Exception { + void testHashMap() throws EstoreException { HashMap a = new HashMap(); a.put(10L, 10L); a.put(20L, 20L); @@ -563,7 +557,7 @@ void testHashMap() throws Exception { } @Test - void testConcurrentHashMap() throws Exception { + void testConcurrentHashMap() throws EstoreException { ConcurrentHashMap a = new ConcurrentHashMap(); a.put("TABLE1", 10L); a.put("TABLE2", 20L); diff --git a/estore/src/test/java/org/estore/DbMetadataTest/EstoreMetadataTest.java b/estore/src/test/java/org/estore/DbMetadataTest/EstoreMetadataTest.java index aee5ca9..53cc555 100644 --- a/estore/src/test/java/org/estore/DbMetadataTest/EstoreMetadataTest.java +++ b/estore/src/test/java/org/estore/DbMetadataTest/EstoreMetadataTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.EstoreOptions; import org.estore.planner.util.Table; import org.junit.jupiter.api.BeforeEach; @@ -12,7 +13,7 @@ public class EstoreMetadataTest { private Estore estore1, estore2, estore_d1, estore_d2, estore_d3, estore_b1, estore_b2; @BeforeEach - public void setup() throws Exception { + public void setup() { String profileOpt = System.getProperty("profile"); Boolean profileFlag = (profileOpt != null) && (profileOpt.equals("true")); @@ -27,14 +28,14 @@ public void setup() throws Exception { } @Test - public void testDbName() throws Exception { + public void testDbName() throws EstoreException { estore1.captureAll(estore2); Table res = estore1.query("MATCH (n: `org.estore.Estore`) RETURN n.name"); assertEquals(EstoreMetadataTest.class.getName() + "2", res.get("n.name").get(0)); } @Test - public void testDbNameRepeat() throws Exception { + public void testDbNameRepeat() throws EstoreException { estore1.captureAll(estore2); Table res = null; for (int i = 0; i < 5; i++) { @@ -44,7 +45,7 @@ public void testDbNameRepeat() throws Exception { } @Test - public void testOptions() throws Exception { + public void testOptions() throws EstoreException { estore_d1 = new Estore( EstoreMetadataTest.class.getName() + "Dfs1", @@ -77,7 +78,7 @@ public void testOptions() throws Exception { } @Test - public void testOptionsRepeat() throws Exception { + public void testOptionsRepeat() throws EstoreException { estore_d1 = new Estore( EstoreMetadataTest.class.getName() + "Dfs1", @@ -113,15 +114,9 @@ public void testOptionsRepeat() throws Exception { } @Test - public void testDynamicClass() throws Exception { + public void testDynamicClass() throws EstoreException { estore2.query("CREATE (n: `Sample`)"); estore1.captureAll(estore2); - // Table res = - // estore1.query( - // "MATCH (n:" - // + " - // `org.estore.Estore`)-[:dynamicClasses]->(:`java.util.ArrayList`)-[:elementData]->(m" - // + " {name: 'Sample'}) RETURN m"); Table res = estore1.query( "MATCH (n:" @@ -131,7 +126,7 @@ public void testDynamicClass() throws Exception { } @Test - public void testDynamicClassRepeat() throws Exception { + public void testDynamicClassRepeat() throws EstoreException { estore2.query("CREATE (n: `Sample`)"); estore1.captureAll(estore2); Table res = null; @@ -140,8 +135,6 @@ public void testDynamicClassRepeat() throws Exception { estore1.query( "MATCH (n:" + " `org.estore.Estore`)-[:dynamicClasses]->()-[:elementData]" - // dynamicClasses is an arraylist of , - // but Class doesn't have element data + "->(m {name: 'Sample'}) RETURN m"); } assertEquals(1, res.getSize()); diff --git a/estore/src/test/java/org/estore/DbMetadataTest/H2MetadataTest.java b/estore/src/test/java/org/estore/DbMetadataTest/H2MetadataTest.java index cc0b0c2..ab8ec6d 100644 --- a/estore/src/test/java/org/estore/DbMetadataTest/H2MetadataTest.java +++ b/estore/src/test/java/org/estore/DbMetadataTest/H2MetadataTest.java @@ -8,10 +8,12 @@ import java.sql.DatabaseMetaData; import java.sql.DriverManager; import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Statement; import java.util.HashSet; import java.util.Set; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.EstoreOptions; import org.estore.planner.util.Table; import org.junit.jupiter.api.AfterEach; @@ -23,7 +25,7 @@ public class H2MetadataTest { private Estore estore1; @BeforeEach - public void setup() throws Exception { + public void setup() throws ClassNotFoundException, SQLException { String profileOpt = System.getProperty("profile"); Boolean profileFlag = (profileOpt != null) && (profileOpt.equals("true")); @@ -35,12 +37,12 @@ public void setup() throws Exception { } @Test - public void testConnection() throws Exception { + public void testConnection() { assertNotNull(h2Conn1, "Connection should not be null"); } @Test - public void testSimpleQueryExecution() throws Exception { + public void testSimpleQueryExecution() throws SQLException { // test the connection works by executing a simple query try (Statement stmt = h2Conn1.createStatement()) { ResultSet rs = stmt.executeQuery("SELECT 1"); @@ -50,7 +52,7 @@ public void testSimpleQueryExecution() throws Exception { } @Test - public void testCatalogsESTORE() throws Exception { + public void testCatalogsESTORE() throws ClassNotFoundException, EstoreException { // insert H2 Engine into estore Class t1 = Class.forName("org.h2.engine.Engine"); estore1.captureAll(t1); @@ -66,7 +68,7 @@ public void testCatalogsESTORE() throws Exception { } @Test - public void testCatalogsESTORERepeat() throws Exception { + public void testCatalogsESTORERepeat() throws ClassNotFoundException, EstoreException { // insert H2 Engine into estore Class t1 = Class.forName("org.h2.engine.Engine"); estore1.captureAll(t1); @@ -85,7 +87,7 @@ public void testCatalogsESTORERepeat() throws Exception { } @Test - public void testCatalogsJDBC() throws Exception { + public void testCatalogsJDBC() throws SQLException { long t1 = System.nanoTime(); DatabaseMetaData meta1 = h2Conn1.getMetaData(); ResultSet res1 = meta1.getCatalogs(); @@ -102,7 +104,7 @@ public void testCatalogsJDBC() throws Exception { } @Test - public void testCatalogsJDBCRepeat() throws Exception { + public void testCatalogsJDBCRepeat() throws SQLException { ResultSet res1 = null; for (int i = 0; i < 5; i++) { long t1 = System.nanoTime(); @@ -122,7 +124,7 @@ public void testCatalogsJDBCRepeat() throws Exception { } @Test - public void testSchemasESTORE() throws Exception { + public void testSchemasESTORE() throws ClassNotFoundException, EstoreException { // insert H2 Engine into estore Class t1 = Class.forName("org.h2.engine.Engine"); estore1.captureAll(t1); @@ -149,7 +151,7 @@ public void testSchemasESTORE() throws Exception { } @Test - public void testSchemasESTORERepeat() throws Exception { + public void testSchemasESTORERepeat() throws ClassNotFoundException, EstoreException { // insert H2 Engine into estore Class t1 = Class.forName("org.h2.engine.Engine"); estore1.captureAll(t1); @@ -177,7 +179,7 @@ public void testSchemasESTORERepeat() throws Exception { } @Test - public void testSchemasJDBC() throws Exception { + public void testSchemasJDBC() throws SQLException { long t1 = System.nanoTime(); DatabaseMetaData meta1 = h2Conn1.getMetaData(); ResultSet res1 = meta1.getSchemas(); @@ -195,7 +197,7 @@ public void testSchemasJDBC() throws Exception { } @Test - public void testSchemasJDBCRepeat() throws Exception { + public void testSchemasJDBCRepeat() throws SQLException { ResultSet res1 = null; for (int i = 0; i < 5; i++) { long t1 = System.nanoTime(); @@ -216,7 +218,7 @@ public void testSchemasJDBCRepeat() throws Exception { } @Test - public void testTablesESTORE() throws Exception { + public void testTablesESTORE() throws ClassNotFoundException, SQLException, EstoreException { // Create new tables Statement stmt = h2Conn1.createStatement(); stmt.execute( @@ -249,7 +251,8 @@ public void testTablesESTORE() throws Exception { } @Test - public void testTablesESTORERepeat() throws Exception { + public void testTablesESTORERepeat() + throws ClassNotFoundException, SQLException, EstoreException { // Create new tables Statement stmt = h2Conn1.createStatement(); stmt.execute( @@ -280,7 +283,7 @@ public void testTablesESTORERepeat() throws Exception { } @Test - public void testTablesJDBC() throws Exception { + public void testTablesJDBC() throws SQLException { // Create new tables Statement stmt = h2Conn1.createStatement(); stmt.execute( @@ -304,7 +307,7 @@ public void testTablesJDBC() throws Exception { } @Test - public void testTablesJDBCRepeat() throws Exception { + public void testTablesJDBCRepeat() throws SQLException { // Create new tables Statement stmt = h2Conn1.createStatement(); stmt.execute( @@ -331,7 +334,7 @@ public void testTablesJDBCRepeat() throws Exception { } @Test - public void testDbNameESTORE() throws Exception { + public void testDbNameESTORE() throws ClassNotFoundException, EstoreException { // insert H2 Engine into estore Class t1 = Class.forName("org.h2.engine.Engine"); estore1.captureAll(t1); @@ -347,7 +350,7 @@ public void testDbNameESTORE() throws Exception { } @Test - public void testUsersESTORE() throws Exception { + public void testUsersESTORE() throws ClassNotFoundException, SQLException, EstoreException { // create new user Statement stmt = h2Conn1.createStatement(); stmt.execute("CREATE USER IF NOT EXISTS USER1 PASSWORD 'password1'"); @@ -373,7 +376,7 @@ public void testUsersESTORE() throws Exception { } @AfterEach - public void drop() throws Exception { + public void drop() throws SQLException { if (h2Conn1 != null) { h2Conn1.close(); } diff --git a/estore/src/test/java/org/estore/IncomingRelationTest.java b/estore/src/test/java/org/estore/IncomingRelationTest.java new file mode 100644 index 0000000..03b2e5b --- /dev/null +++ b/estore/src/test/java/org/estore/IncomingRelationTest.java @@ -0,0 +1,38 @@ +package org.estore; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.estore.example.Person; +import org.estore.planner.util.Table; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class IncomingRelationTest { + private Estore db; + + @BeforeEach + void setUp() throws EstoreException { + db = new Estore(IncomingRelationTest.class.getName()); + Person bob = new Person("Bob", 30); + Person alice = new Person("Alice", 28, bob); + db.captureAll(alice); + } + + @Test + void incomingTypedEdgeFindsReferrer() { + Table result = + db.query( + "MATCH (b:`org.estore.example.Person`)<-[:friend]-(a:`org.estore.example.Person`) RETURN a"); + assertEquals(1, result.getSize()); + assertEquals("Alice", ((Person) result.get("a").get(0)).name); + } + + @Test + void incomingVarLengthFindsReferrer() { + Table result = + db.query( + "MATCH (a:`org.estore.example.Person`)<-[*1..2]-(b:`org.estore.example.Person`) RETURN b"); + assertEquals(1, result.getSize()); + assertEquals("Alice", ((Person) result.get("b").get(0)).name); + } +} diff --git a/estore/src/test/java/org/estore/MultiDimensionalArrayTest.java b/estore/src/test/java/org/estore/MultiDimensionalArrayTest.java index 698deb9..48a9234 100644 --- a/estore/src/test/java/org/estore/MultiDimensionalArrayTest.java +++ b/estore/src/test/java/org/estore/MultiDimensionalArrayTest.java @@ -17,13 +17,13 @@ public class MultiDimensionalArrayTest { private ThreadLocalRandom rand; @BeforeEach - public void setup() throws Exception { + public void setup() { rand = ThreadLocalRandom.current(); db = new Estore(MultiDimensionalArrayTest.class.getName()); } @Test - public void testSimple3DMatrix() throws Exception { + public void testSimple3DMatrix() throws EstoreException { String[][][] m = new String[][][] {{{"a", "b"}, {"c", "d"}}, {{"e", "f"}, {"g", "h"}}}; db.captureAll(m); @@ -36,7 +36,7 @@ public void testSimple3DMatrix() throws Exception { } @Test - public void testLongMatrix2D_varLength() throws Exception { + public void testLongMatrix2DVarLength() throws EstoreException { Long[][] grid = new Long[10][10]; long target = rand.nextLong(0, Long.MAX_VALUE); int ti = 3; @@ -59,7 +59,7 @@ public void testLongMatrix2D_varLength() throws Exception { } @Test - public void testLongMatrix2D_indexed() throws Exception { + public void testLongMatrix2DIndexed() throws EstoreException { Long[][] grid = new Long[10][10]; long target = rand.nextLong(0, Long.MAX_VALUE); int ti = 2; @@ -84,7 +84,7 @@ public void testLongMatrix2D_indexed() throws Exception { } @Test - public void testIntMatrix2D_varLength() throws Exception { + public void testIntMatrix2DVarLength() throws EstoreException { int[][] grid = new int[8][8]; int target = 4242; int ti = 1; @@ -107,7 +107,7 @@ public void testIntMatrix2D_varLength() throws Exception { } @Test - public void testIntMatrix2D_indexed() throws Exception { + public void testIntMatrix2DIndexed() throws EstoreException { int[][] grid = new int[8][8]; int target = 7777; int ti = 0; @@ -132,7 +132,7 @@ public void testIntMatrix2D_indexed() throws Exception { } @Test - public void testObjectMatrix3D_varLength() throws Exception { + public void testObjectMatrix3DVarLength() throws EstoreException { Object[][][] cube = new Object[4][4][4]; long target = rand.nextLong(0, Long.MAX_VALUE); int a = 1; @@ -161,7 +161,7 @@ public void testObjectMatrix3D_varLength() throws Exception { } @Test - public void testObjectMatrix3D_indexed() throws Exception { + public void testObjectMatrix3DIndexed() throws EstoreException { Object[][][] cube = new Object[3][3][3]; long target = rand.nextLong(0, Long.MAX_VALUE); int a = 0; @@ -193,7 +193,7 @@ public void testObjectMatrix3D_indexed() throws Exception { } @Test - public void testCaptureInsertsAllDims() throws Exception { + public void testCaptureInsertsAllDims() throws EstoreException { Long[][] grid = new Long[2][2]; grid[0][0] = 1L; grid[0][1] = 2L; @@ -210,7 +210,7 @@ public void testCaptureInsertsAllDims() throws Exception { } @Test - public void testDeleteArrayIndex() throws Exception { + public void testDeleteArrayIndex() throws EstoreException { Long[] arr = new Long[] {10L, 20L, 30L}; db.captureAll(arr); @@ -219,4 +219,81 @@ public void testDeleteArrayIndex() throws Exception { assertEquals(10L, ((Long) Array.get(arr, 0)).longValue()); assertEquals(30L, ((Long) Array.get(arr, 2)).longValue()); } + + @Test + public void testArrayTable() throws EstoreException { + Long[][] grid = new Long[10][10]; + long target = rand.nextLong(0, Long.MAX_VALUE); + int ti = 4; + int tj = 6; + for (int i = 0; i < 10; i++) { + for (int j = 0; j < 10; j++) { + grid[i][j] = (i == ti && j == tj) ? target : rand.nextLong(0, Long.MAX_VALUE); + } + } + db.captureAll(grid); + + Table result = + db.query( + "MATCH (n:`" + + grid.getClass().getName() + + "`)-[]->()-[]->(m {value:" + + target + + "}) RETURN m"); + assertEquals(target, ((Long) result.get("m").get(0)).longValue()); + } + + @Test + public void testArrayTableDfs() throws EstoreException { + Estore dfsStore = + new Estore( + MultiDimensionalArrayTest.class.getName() + "Dfs", + new EstoreOptions().useDfs(true)); + Long[][] grid = new Long[10][10]; + long target = rand.nextLong(0, Long.MAX_VALUE); + int ti = 4; + int tj = 6; + for (int i = 0; i < 10; i++) { + for (int j = 0; j < 10; j++) { + grid[i][j] = (i == ti && j == tj) ? target : rand.nextLong(0, Long.MAX_VALUE); + } + } + dfsStore.captureAll(grid); + + Table result = + dfsStore.query( + "MATCH (n:`" + + grid.getClass().getName() + + "`)-[]->()-[]->(m {value:" + + target + + "}) RETURN m"); + assertEquals(target, ((Long) result.get("m").get(0)).longValue()); + } + + @Test + public void testIntMatrix2DDfs() throws EstoreException { + Estore dfsStore = + new Estore( + MultiDimensionalArrayTest.class.getName() + "IntDfs", + new EstoreOptions().useDfs(true)); + int[][] grid = new int[8][8]; + int target = 4242; + int ti = 1; + int tj = 4; + for (int i = 0; i < 8; i++) { + for (int j = 0; j < 8; j++) { + grid[i][j] = (i == ti && j == tj) ? target : rand.nextInt(0, 10000); + } + } + dfsStore.captureAll(grid); + + Table result = + dfsStore.query( + "MATCH (n:`" + + grid.getClass().getName() + + "`)-[]->()-[]->(m {value:" + + target + + "}) RETURN m"); + assertEquals(target, ((Integer) result.get("m").get(0)).intValue()); + } } diff --git a/estore/src/test/java/org/estore/MyFirstTest.java b/estore/src/test/java/org/estore/MyFirstTest.java index 7faabb2..92ca660 100644 --- a/estore/src/test/java/org/estore/MyFirstTest.java +++ b/estore/src/test/java/org/estore/MyFirstTest.java @@ -12,7 +12,7 @@ public class MyFirstTest { private Estore db; @BeforeEach - void setup() throws Exception { + void setup() { db = new Estore(MyFirstTest.class.getName()); } diff --git a/estore/src/test/java/org/estore/NodePropScanTest.java b/estore/src/test/java/org/estore/NodePropScanTest.java new file mode 100644 index 0000000..e84c29e --- /dev/null +++ b/estore/src/test/java/org/estore/NodePropScanTest.java @@ -0,0 +1,33 @@ +package org.estore; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.estore.example.Person; +import org.estore.planner.util.Table; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class NodePropScanTest { + private Estore db; + + @BeforeEach + void setUp() throws EstoreException { + db = new Estore(NodePropScanTest.class.getName()); + Person bob = new Person("Bob", 30); + Person alice = new Person("Alice", 28, bob); + db.captureAll(alice); + } + + @Test + void unlabeledPropertyMatchFindsPersonByName() { + Table result = db.query("MATCH (n {name:'Alice'}) RETURN n"); + assertEquals(1, result.getSize()); + assertEquals("Alice", ((Person) result.get("n").get(0)).name); + } + + @Test + void unlabeledPropertyMatchExcludesWrongName() { + Table result = db.query("MATCH (n {name:'Nobody'}) RETURN n"); + assertEquals(0, result.getSize()); + } +} diff --git a/estore/src/test/java/org/estore/PropertiesFunctionTest.java b/estore/src/test/java/org/estore/PropertiesFunctionTest.java new file mode 100644 index 0000000..ee5d1b0 --- /dev/null +++ b/estore/src/test/java/org/estore/PropertiesFunctionTest.java @@ -0,0 +1,27 @@ +package org.estore; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.HashMap; +import org.estore.example.Person; +import org.estore.planner.util.Table; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class PropertiesFunctionTest { + private Estore db; + + @BeforeEach + void setUp() throws EstoreException { + db = new Estore(PropertiesFunctionTest.class.getName()); + db.captureAll(new Person("A", 20)); + } + + @Test + void propertiesReturnsPrimitiveFields() { + Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN properties(p)"); + HashMap props = (HashMap) result.get("PROPERTIES(p)").get(0); + assertEquals("A", props.get("name")); + assertEquals(20, props.get("age")); + } +} diff --git a/estore/src/test/java/org/estore/SimpleQueryTest.java b/estore/src/test/java/org/estore/SimpleQueryTest.java index e586964..49d12c3 100644 --- a/estore/src/test/java/org/estore/SimpleQueryTest.java +++ b/estore/src/test/java/org/estore/SimpleQueryTest.java @@ -11,7 +11,7 @@ public class SimpleQueryTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() { db = new Estore(SimpleQueryTest.class.getName()); } @@ -24,5 +24,9 @@ void createsAndFindsSingleNode() { Table count = db.query("MATCH (n:`SimpleNode`) RETURN COUNT(n)"); assertEquals(1, count.getSize()); assertEquals(1, count.get("COUNT(n)").get(0)); + + Table star = db.query("MATCH (n:`SimpleNode`) RETURN COUNT(*)"); + assertEquals(1, star.getSize()); + assertEquals(1, star.get("COUNT(*)").get(0)); } } diff --git a/estore/src/test/java/org/estore/ToIntegerFunctionTest.java b/estore/src/test/java/org/estore/ToIntegerFunctionTest.java index 3f36e55..87704a4 100644 --- a/estore/src/test/java/org/estore/ToIntegerFunctionTest.java +++ b/estore/src/test/java/org/estore/ToIntegerFunctionTest.java @@ -11,14 +11,26 @@ public class ToIntegerFunctionTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() throws EstoreException { db = new Estore(ToIntegerFunctionTest.class.getName()); db.captureAll(new Person("A", 20)); } @Test - void toIntegerConvertsStringLiteral() throws Exception { + void toIntegerConvertsStringLiteral() { Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN toInteger('9')"); assertEquals(9, result.get("TOINTEGER(9)").get(0)); } + + @Test + void toIntegerConvertsProperty() { + Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN toInteger(p.age)"); + assertEquals(20, result.get("TOINTEGER(p.age)").get(0)); + } + + @Test + void toIntegerReturnsNullForNonNumericString() { + Table result = db.query("MATCH (p:`org.estore.example.Person`) RETURN toInteger('nope')"); + assertEquals(null, result.get("TOINTEGER(nope)").get(0)); + } } diff --git a/estore/src/test/java/org/estore/TypeFunctionTest.java b/estore/src/test/java/org/estore/TypeFunctionTest.java index 7801d71..17caa95 100644 --- a/estore/src/test/java/org/estore/TypeFunctionTest.java +++ b/estore/src/test/java/org/estore/TypeFunctionTest.java @@ -11,12 +11,12 @@ public class TypeFunctionTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() { db = new Estore(TypeFunctionTest.class.getName()); } @Test - void typeReturnsEdgeName() throws Exception { + void typeReturnsEdgeName() throws EstoreException { Person bob = new Person("Bob", 30); Person alice = new Person("Alice", 28, bob); db.captureAll(alice); diff --git a/estore/src/test/java/org/estore/VarLengthRangeTest.java b/estore/src/test/java/org/estore/VarLengthRangeTest.java new file mode 100644 index 0000000..5e3ac86 --- /dev/null +++ b/estore/src/test/java/org/estore/VarLengthRangeTest.java @@ -0,0 +1,39 @@ +package org.estore; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.estore.example.Person; +import org.estore.planner.util.Table; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class VarLengthRangeTest { + private Estore db; + + @BeforeEach + void setUp() throws EstoreException { + db = new Estore(VarLengthRangeTest.class.getName()); + Person charlie = new Person("Charlie", 25); + Person bob = new Person("Bob", 30, charlie); + Person alice = new Person("Alice", 28, bob); + db.captureAll(alice); + } + + @Test + void exactTwoHopsFindsCharlie() { + Table result = + db.query( + "MATCH (a:`org.estore.example.Person`)-[*2]->(b:`org.estore.example.Person`) RETURN b"); + assertEquals(1, result.getSize()); + assertEquals("Charlie", ((Person) result.get("b").get(0)).name); + } + + @Test + void twoOrMoreHopsFindsCharlie() { + Table result = + db.query( + "MATCH (a:`org.estore.example.Person`)-[*2..]->(b:`org.estore.example.Person`) RETURN b"); + assertEquals(1, result.getSize()); + assertEquals("Charlie", ((Person) result.get("b").get(0)).name); + } +} diff --git a/estore/src/test/java/org/estore/compiler/CodeGenTest.java b/estore/src/test/java/org/estore/compiler/CodeGenTest.java index 77fee7e..74ab011 100644 --- a/estore/src/test/java/org/estore/compiler/CodeGenTest.java +++ b/estore/src/test/java/org/estore/compiler/CodeGenTest.java @@ -23,11 +23,7 @@ public class CodeGenTest { @BeforeEach public void initDatabase() { - try { - estore = new Estore(CodeGenTest.class.getName(), new EstoreOptions().useDfs(false)); - } catch (Exception e) { - e.printStackTrace(); - } + estore = new Estore(CodeGenTest.class.getName(), new EstoreOptions().useDfs(false)); } @Test @@ -202,7 +198,7 @@ void testCreateLabelNode() throws EstoreException { } @Test - void testNodeAddPropertyCypher2() throws Exception { + void testNodeAddPropertyCypher2() throws ReflectiveOperationException { Table result = estore.query("CREATE (n:`DummyClass4` {name:'Uki', age:30}) RETURN n"); Object obj = result.get("n").get(0); Class objClass = obj.getClass(); diff --git a/estore/src/test/java/org/estore/compiler/ImplCodeGenTest.java b/estore/src/test/java/org/estore/compiler/ImplCodeGenTest.java index ab1b03f..a804f50 100644 --- a/estore/src/test/java/org/estore/compiler/ImplCodeGenTest.java +++ b/estore/src/test/java/org/estore/compiler/ImplCodeGenTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -14,7 +15,7 @@ public class ImplCodeGenTest { private static final Path RESOURCES = Paths.get("src/test/resources/org/estore/compiler"); - private void runTransform(Path fixture, Path input, Path output) throws Exception { + private void runTransform(Path fixture, Path input, Path output) throws IOException { Files.copy(RESOURCES.resolve(fixture), input); if (output != null) { ImplCodeGen.main(new String[] {input.toString(), output.toString()}); @@ -23,12 +24,12 @@ private void runTransform(Path fixture, Path input, Path output) throws Exceptio } } - private String readString(Path path) throws Exception { + private String readString(Path path) throws IOException { return new String(Files.readAllBytes(path), StandardCharsets.UTF_8); } @Test - void transformsMinimalSourceWithCompiledQueryCode(@TempDir Path tempDir) throws Exception { + void transformsMinimalSourceWithCompiledQueryCode(@TempDir Path tempDir) throws IOException { Path input = tempDir.resolve("MinimalQuerySource.java"); Path output = tempDir.resolve("TransformedMinimalQuerySource.java"); runTransform(Paths.get("MinimalQuerySource.java"), input, output); @@ -46,7 +47,7 @@ void transformsMinimalSourceWithCompiledQueryCode(@TempDir Path tempDir) throws } @Test - void transformsConcatenatedQueryString(@TempDir Path tempDir) throws Exception { + void transformsConcatenatedQueryString(@TempDir Path tempDir) throws IOException { Path input = tempDir.resolve("ConcatQuerySource.java"); Path output = tempDir.resolve("TransformedConcatQuerySource.java"); runTransform(Paths.get("ConcatQuerySource.java"), input, output); @@ -57,7 +58,7 @@ void transformsConcatenatedQueryString(@TempDir Path tempDir) throws Exception { } @Test - void leavesUnsupportedQueryArgumentInPlace(@TempDir Path tempDir) throws Exception { + void leavesUnsupportedQueryArgumentInPlace(@TempDir Path tempDir) throws IOException { Path input = tempDir.resolve("UnsupportedQuerySource.java"); Path output = tempDir.resolve("TransformedUnsupportedQuerySource.java"); runTransform(Paths.get("UnsupportedQuerySource.java"), input, output); @@ -68,7 +69,7 @@ void leavesUnsupportedQueryArgumentInPlace(@TempDir Path tempDir) throws Excepti } @Test - void leavesNonLiteralConcatenationInPlace(@TempDir Path tempDir) throws Exception { + void leavesNonLiteralConcatenationInPlace(@TempDir Path tempDir) throws IOException { Path input = tempDir.resolve("MixedConcatQuerySource.java"); Path output = tempDir.resolve("TransformedMixedConcatQuerySource.java"); runTransform(Paths.get("MixedConcatQuerySource.java"), input, output); @@ -79,7 +80,7 @@ void leavesNonLiteralConcatenationInPlace(@TempDir Path tempDir) throws Exceptio } @Test - void transformsFileThatAlsoHasNonQueryMethodCalls(@TempDir Path tempDir) throws Exception { + void transformsFileThatAlsoHasNonQueryMethodCalls(@TempDir Path tempDir) throws IOException { Path input = tempDir.resolve("WithNonQueryCallSource.java"); Path output = tempDir.resolve("TransformedWithNonQueryCallSource.java"); runTransform(Paths.get("WithNonQueryCallSource.java"), input, output); @@ -90,7 +91,7 @@ void transformsFileThatAlsoHasNonQueryMethodCalls(@TempDir Path tempDir) throws } @Test - void usesDefaultOutputPathWhenOnlyInputProvided(@TempDir Path tempDir) throws Exception { + void usesDefaultOutputPathWhenOnlyInputProvided(@TempDir Path tempDir) throws IOException { Path input = tempDir.resolve("MinimalQuerySource.java"); runTransform(Paths.get("MinimalQuerySource.java"), input, null); diff --git a/estore/src/test/java/org/estore/compiler/UtilTest.java b/estore/src/test/java/org/estore/compiler/UtilTest.java index 668ac12..babfb6d 100644 --- a/estore/src/test/java/org/estore/compiler/UtilTest.java +++ b/estore/src/test/java/org/estore/compiler/UtilTest.java @@ -8,6 +8,7 @@ import java.util.Collections; import java.util.List; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.example.A; import org.estore.example.B; import org.estore.planner.util.ClassInfo; @@ -22,7 +23,7 @@ public class UtilTest { private ClassInfo aInfo; @BeforeEach - void setUp() throws Exception { + void setUp() throws EstoreException { estore = new Estore(UtilTest.class.getName()); a = estore.insert(A.class); aInfo = estore.getLabelClassInfoMap().get(A.class.getName()); @@ -118,7 +119,7 @@ void getsStartingNodesByLabelAndProperties() { } @Test - void getsNeighborsFromAllOrNamedEdges() throws Exception { + void getsNeighborsFromAllOrNamedEdges() throws EstoreException { estore.insert(new NullReferenceNode()); List allNeighbors = Util.getNeighbors(a, null, estore); diff --git a/estore/src/test/java/org/estore/datastructuretests/apachecommons/DualHashBidiMapTest.java b/estore/src/test/java/org/estore/datastructuretests/apachecommons/DualHashBidiMapTest.java index 2e0f2b2..706a7c5 100644 --- a/estore/src/test/java/org/estore/datastructuretests/apachecommons/DualHashBidiMapTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/apachecommons/DualHashBidiMapTest.java @@ -5,7 +5,6 @@ import org.apache.commons.collections4.bidimap.DualHashBidiMap; import org.estore.Estore; import org.estore.EstoreException; -import org.estore.EstoreOptions; import org.estore.planner.util.Table; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,8 +15,8 @@ public class DualHashBidiMapTest { private int size; @BeforeEach - public void initDatabase() throws Exception { - estore = new Estore(DualHashBidiMapTest.class.getName(), new EstoreOptions()); + public void initDatabase() { + estore = new Estore(DualHashBidiMapTest.class.getName()); size = 10; } diff --git a/estore/src/test/java/org/estore/datastructuretests/apachecommons/GrowthListTest.java b/estore/src/test/java/org/estore/datastructuretests/apachecommons/GrowthListTest.java index f8e5ef5..9f8cb88 100644 --- a/estore/src/test/java/org/estore/datastructuretests/apachecommons/GrowthListTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/apachecommons/GrowthListTest.java @@ -4,6 +4,7 @@ import org.apache.commons.collections4.list.GrowthList; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.planner.util.Table; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,13 +15,13 @@ public class GrowthListTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(GrowthListTest.class.getName()); size = 10; } @Test - void testGrowthListSize() throws Exception { + void testGrowthListSize() throws EstoreException { GrowthList list = new GrowthList(); for (int i = 0; i < size; i++) { diff --git a/estore/src/test/java/org/estore/datastructuretests/apachecommons/PatriciaTrieTest.java b/estore/src/test/java/org/estore/datastructuretests/apachecommons/PatriciaTrieTest.java index 1543fae..42896c6 100644 --- a/estore/src/test/java/org/estore/datastructuretests/apachecommons/PatriciaTrieTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/apachecommons/PatriciaTrieTest.java @@ -15,7 +15,7 @@ public class PatriciaTrieTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(PatriciaTrieTest.class.getName()); size = 5; } diff --git a/estore/src/test/java/org/estore/datastructuretests/eclipse/FastListTest.java b/estore/src/test/java/org/estore/datastructuretests/eclipse/FastListTest.java index a588e2f..2cfc40e 100644 --- a/estore/src/test/java/org/estore/datastructuretests/eclipse/FastListTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/eclipse/FastListTest.java @@ -15,7 +15,7 @@ public class FastListTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(FastListTest.class.getName()); size = 10; } diff --git a/estore/src/test/java/org/estore/datastructuretests/eclipse/HashBagTest.java b/estore/src/test/java/org/estore/datastructuretests/eclipse/HashBagTest.java index 2fd863b..3844432 100644 --- a/estore/src/test/java/org/estore/datastructuretests/eclipse/HashBagTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/eclipse/HashBagTest.java @@ -15,7 +15,7 @@ public class HashBagTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(HashBagTest.class.getName()); size = 10; } diff --git a/estore/src/test/java/org/estore/datastructuretests/eclipse/HashBiMapTest.java b/estore/src/test/java/org/estore/datastructuretests/eclipse/HashBiMapTest.java index 3aa8dc0..828b1a0 100644 --- a/estore/src/test/java/org/estore/datastructuretests/eclipse/HashBiMapTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/eclipse/HashBiMapTest.java @@ -15,7 +15,7 @@ public class HashBiMapTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(HashBiMapTest.class.getName()); size = 10; } diff --git a/estore/src/test/java/org/estore/datastructuretests/fastutil/FastutilTest.java b/estore/src/test/java/org/estore/datastructuretests/fastutil/FastutilTest.java index d16de3d..aa6772d 100644 --- a/estore/src/test/java/org/estore/datastructuretests/fastutil/FastutilTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/fastutil/FastutilTest.java @@ -8,6 +8,7 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import java.util.concurrent.ThreadLocalRandom; import org.estore.Estore; +import org.estore.EstoreException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,12 +20,12 @@ public class FastutilTest { private Long2IntAVLTreeMap map; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(FastutilTest.class.getName()); } @Test - public void testArrayListContains() throws Exception { + public void testArrayListContains() throws EstoreException { rand = ThreadLocalRandom.current(); list = new LongArrayList(); for (int j = 0; j < 100; j++) { @@ -39,7 +40,7 @@ public void testArrayListContains() throws Exception { } @Test - public void testHashSetContains() throws Exception { + public void testHashSetContains() throws EstoreException { set = new LongOpenHashSet(); for (int j = 0; j < 100; j++) { set.add(j); @@ -53,7 +54,7 @@ public void testHashSetContains() throws Exception { } @Test - public void testAVLTreeMapKeys() throws Exception { + public void testAVLTreeMapKeys() throws EstoreException { map = new Long2IntAVLTreeMap(); for (int j = 1; j <= 100; j++) { map.put(j, j); diff --git a/estore/src/test/java/org/estore/datastructuretests/guava/HashBiMapTest.java b/estore/src/test/java/org/estore/datastructuretests/guava/HashBiMapTest.java index fab3fff..7a4d96a 100644 --- a/estore/src/test/java/org/estore/datastructuretests/guava/HashBiMapTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/guava/HashBiMapTest.java @@ -15,7 +15,7 @@ public class HashBiMapTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(HashBiMapTest.class.getName()); size = 10; } diff --git a/estore/src/test/java/org/estore/datastructuretests/guava/LinkedListMultimapTest.java b/estore/src/test/java/org/estore/datastructuretests/guava/LinkedListMultimapTest.java index e8be8d2..7ab3cae 100644 --- a/estore/src/test/java/org/estore/datastructuretests/guava/LinkedListMultimapTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/guava/LinkedListMultimapTest.java @@ -15,7 +15,7 @@ public class LinkedListMultimapTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(LinkedListMultimapTest.class.getName()); size = 10; } diff --git a/estore/src/test/java/org/estore/datastructuretests/guava/MinMaxPriorityQueueTest.java b/estore/src/test/java/org/estore/datastructuretests/guava/MinMaxPriorityQueueTest.java index 1b36530..d2d304a 100644 --- a/estore/src/test/java/org/estore/datastructuretests/guava/MinMaxPriorityQueueTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/guava/MinMaxPriorityQueueTest.java @@ -14,7 +14,7 @@ public class MinMaxPriorityQueueTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(MinMaxPriorityQueueTest.class.getName()); size = 10; } diff --git a/estore/src/test/java/org/estore/datastructuretests/jcf/ArrayListTest.java b/estore/src/test/java/org/estore/datastructuretests/jcf/ArrayListTest.java index fbd2f55..ac96e08 100644 --- a/estore/src/test/java/org/estore/datastructuretests/jcf/ArrayListTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/jcf/ArrayListTest.java @@ -15,7 +15,7 @@ public class ArrayListTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(ArrayListTest.class.getName()); size = 10; } diff --git a/estore/src/test/java/org/estore/datastructuretests/jcf/HashSetTest.java b/estore/src/test/java/org/estore/datastructuretests/jcf/HashSetTest.java index 92ee8a0..5e8fa7c 100644 --- a/estore/src/test/java/org/estore/datastructuretests/jcf/HashSetTest.java +++ b/estore/src/test/java/org/estore/datastructuretests/jcf/HashSetTest.java @@ -15,7 +15,7 @@ public class HashSetTest { private int size; @BeforeEach - public void initDatabase() throws Exception { + public void initDatabase() { estore = new Estore(HashSetTest.class.getName()); size = 10; } diff --git a/estore/src/test/java/org/estore/eval/datastructure/EclipseTest.java b/estore/src/test/java/org/estore/eval/datastructure/EclipseTest.java index a467aa8..1bb7dfe 100644 --- a/estore/src/test/java/org/estore/eval/datastructure/EclipseTest.java +++ b/estore/src/test/java/org/estore/eval/datastructure/EclipseTest.java @@ -11,6 +11,7 @@ import org.eclipse.collections.impl.set.mutable.UnifiedSet; import org.eclipse.collections.impl.stack.mutable.ArrayStack; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.planner.util.Table; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -20,13 +21,13 @@ public class EclipseTest { private static ThreadLocalRandom rand; @BeforeEach - public void setup() throws Exception { + public void setup() { estore = new Estore(EclipseTest.class.getName()); rand = ThreadLocalRandom.current(); } @Test - public void testUnifiedSet() throws Exception { + public void testUnifiedSet() throws EstoreException { ArrayList setData = new ArrayList(); int ind = rand.nextInt(0, 99); for (int j = 0; j < 100; j++) { @@ -52,7 +53,7 @@ public void testUnifiedSet() throws Exception { } @Test - public void testUnifiedMap() throws Exception { + public void testUnifiedMap() throws EstoreException { ArrayList setData = new ArrayList(); UnifiedMap unifiedMap = new UnifiedMap(); int ind = rand.nextInt(0, 99); @@ -80,7 +81,7 @@ public void testUnifiedMap() throws Exception { } @Test - public void testFastList() throws Exception { + public void testFastList() throws EstoreException { FastList fastList = new FastList(); int ind = rand.nextInt(0, 99); for (int j = 0; j < 100; j++) { @@ -105,7 +106,7 @@ public void testFastList() throws Exception { } @Test - public void testArrayStack() throws Exception { + public void testArrayStack() throws EstoreException { ArrayStack arrayStack = new ArrayStack(); ArrayList stackData = new ArrayList(); int ind = rand.nextInt(0, 99); @@ -130,7 +131,7 @@ public void testArrayStack() throws Exception { } @Test - public void testImmutableArrayList() throws Exception { + public void testImmutableArrayList() throws EstoreException { ArrayList listData = new ArrayList(); int ind = rand.nextInt(0, 99); for (int j = 0; j < 100; j++) { diff --git a/estore/src/test/java/org/estore/eval/datastructure/GuavaTest.java b/estore/src/test/java/org/estore/eval/datastructure/GuavaTest.java index 7d612ae..6e76ab2 100644 --- a/estore/src/test/java/org/estore/eval/datastructure/GuavaTest.java +++ b/estore/src/test/java/org/estore/eval/datastructure/GuavaTest.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.concurrent.ThreadLocalRandom; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.planner.util.Table; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -15,13 +16,13 @@ public class GuavaTest { private static ThreadLocalRandom rand; @BeforeEach - public void setup() throws Exception { + public void setup() { rand = ThreadLocalRandom.current(); estore = new Estore(GuavaTest.class.getName()); } @Test - public void testArrayTable() throws Exception { + public void testArrayTable() throws EstoreException { ArrayList rows = new ArrayList(); ArrayList columns = new ArrayList(); for (long j = 0; j < 10; j++) { diff --git a/estore/src/test/java/org/estore/eval/datastructure/JCFTest.java b/estore/src/test/java/org/estore/eval/datastructure/JCFTest.java index 2c63053..80ba87b 100644 --- a/estore/src/test/java/org/estore/eval/datastructure/JCFTest.java +++ b/estore/src/test/java/org/estore/eval/datastructure/JCFTest.java @@ -10,6 +10,7 @@ import java.util.Vector; import java.util.concurrent.ThreadLocalRandom; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.planner.util.Table; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,13 +20,13 @@ public class JCFTest { private static ThreadLocalRandom rand; @BeforeEach - public void setup() throws Exception { + public void setup() { rand = ThreadLocalRandom.current(); estore = new Estore(JCFTest.class.getName()); } @Test - public void testArrayList() throws Exception { + public void testArrayList() throws EstoreException { ArrayList list = new ArrayList(); int ind = rand.nextInt(0, 99); for (int j = 0; j < 100; j++) { @@ -46,7 +47,7 @@ public void testArrayList() throws Exception { } @Test - public void testArrayDeque() throws Exception { + public void testArrayDeque() throws EstoreException { ArrayDeque list = new ArrayDeque(); int ind = rand.nextInt(0, 99); for (int j = 0; j < 100; j++) { @@ -67,7 +68,7 @@ public void testArrayDeque() throws Exception { } @Test - public void testLinkedList() throws Exception { + public void testLinkedList() throws EstoreException { LinkedList list = new LinkedList(); int ind = rand.nextInt(0, 99); for (int j = 0; j < 100; j++) { @@ -88,7 +89,7 @@ public void testLinkedList() throws Exception { } @Test - public void testVector() throws Exception { + public void testVector() throws EstoreException { Vector list = new Vector(); int ind = rand.nextInt(0, 99); for (int j = 0; j < 100; j++) { @@ -109,7 +110,7 @@ public void testVector() throws Exception { } @Test - public void testHashMap() throws Exception { + public void testHashMap() throws EstoreException { HashMap map = new HashMap(); while (map.size() != 99) { map.put(rand.nextLong(0, Long.MAX_VALUE), rand.nextLong(0, Long.MAX_VALUE)); diff --git a/estore/src/test/java/org/estore/eval/ldbc/finbench/Fin001Test.java b/estore/src/test/java/org/estore/eval/ldbc/finbench/Fin001Test.java index 4c4145c..e22126e 100644 --- a/estore/src/test/java/org/estore/eval/ldbc/finbench/Fin001Test.java +++ b/estore/src/test/java/org/estore/eval/ldbc/finbench/Fin001Test.java @@ -12,6 +12,7 @@ import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.EstoreOptions; import org.estore.compiler.CompileQuery; import org.estore.eval.ldbc.finbench.util.*; @@ -24,7 +25,7 @@ public class Fin001Test { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore(Fin001Test.class.getName(), new EstoreOptions().profile(false)); readDataSet(); @@ -140,7 +141,7 @@ public void testTsr1() { assertEquals(result.get("account.accountType").get(0), "certificate of deposit"); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/estore/src/test/java/org/estore/eval/ldbc/snb/Snb01Test.java b/estore/src/test/java/org/estore/eval/ldbc/snb/Snb01Test.java index 2592c8f..c7e9e58 100644 --- a/estore/src/test/java/org/estore/eval/ldbc/snb/Snb01Test.java +++ b/estore/src/test/java/org/estore/eval/ldbc/snb/Snb01Test.java @@ -12,6 +12,7 @@ import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.EstoreOptions; import org.estore.compiler.CompileQuery; import org.estore.eval.ldbc.snb.util.*; @@ -24,7 +25,7 @@ public class Snb01Test { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore(Snb01Test.class.getName(), new EstoreOptions().profile(false)); readDataSet(); } @@ -166,7 +167,7 @@ public void testInteractiveUpdateQuery8() { assertEquals(result.get("COUNT(r)").get(0), 1); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap places = new HashMap(); HashMap tags = new HashMap(); diff --git a/estore/src/test/java/org/estore/planner/expressions/relational/EqualsRelationExprTest.java b/estore/src/test/java/org/estore/planner/expressions/relational/EqualsRelationExprTest.java index 35a90c5..f016539 100644 --- a/estore/src/test/java/org/estore/planner/expressions/relational/EqualsRelationExprTest.java +++ b/estore/src/test/java/org/estore/planner/expressions/relational/EqualsRelationExprTest.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.function.Function; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.example.Person; import org.estore.planner.expressions.LogicalExpr; import org.estore.planner.expressions.function.FunctionInvocationExpr; @@ -22,12 +23,12 @@ class EqualsRelationExprTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() { db = new Estore(EqualsRelationExprTest.class.getName() + "_" + System.nanoTime()); } @Test - void queryWherePropertyEqualsLiteralKeepsMatchingRow() throws Exception { + void queryWherePropertyEqualsLiteralKeepsMatchingRow() throws EstoreException { db.captureAll(new Person("Alice", 17)); Table result = db.query("MATCH (p:`org.estore.example.Person`) WHERE p.name = 'Alice' RETURN p"); @@ -35,7 +36,7 @@ void queryWherePropertyEqualsLiteralKeepsMatchingRow() throws Exception { } @Test - void queryWherePropertyEqualsLiteralExcludesNonMatchingRow() throws Exception { + void queryWherePropertyEqualsLiteralExcludesNonMatchingRow() throws EstoreException { db.captureAll(new Person("Alice", 17)); Table result = db.query("MATCH (p:`org.estore.example.Person`) WHERE p.name = 'Bob' RETURN p"); @@ -43,7 +44,7 @@ void queryWherePropertyEqualsLiteralExcludesNonMatchingRow() throws Exception { } @Test - void queryWherePropertyNotEqualsLiteralFiltersExpectedRows() throws Exception { + void queryWherePropertyNotEqualsLiteralFiltersExpectedRows() throws EstoreException { capturePeople(new Person("Alice", 17), new Person("Bob", 15)); Table result = db.query("MATCH (p:`org.estore.example.Person`) WHERE p.name <> 'Alice' RETURN p"); @@ -51,34 +52,34 @@ void queryWherePropertyNotEqualsLiteralFiltersExpectedRows() throws Exception { } @Test - void queryWherePropertyLessThanLiteralFiltersExpectedRows() throws Exception { + void queryWherePropertyLessThanLiteralFiltersExpectedRows() throws EstoreException { capturePeople(new Person("Alice", 17), new Person("Bob", 15)); Table result = db.query("MATCH (p:`org.estore.example.Person`) WHERE p.age < 17 RETURN p"); assertEquals(1, result.getSize()); } @Test - void queryWherePropertyLessThanOrEqualsLiteralFiltersExpectedRows() throws Exception { + void queryWherePropertyLessThanOrEqualsLiteralFiltersExpectedRows() throws EstoreException { capturePeople(new Person("Alice", 17), new Person("Bob", 15)); Table result = db.query("MATCH (p:`org.estore.example.Person`) WHERE p.age <= 15 RETURN p"); assertEquals(1, result.getSize()); } @Test - void queryWherePropertyGreaterThanLiteralFiltersExpectedRows() throws Exception { + void queryWherePropertyGreaterThanLiteralFiltersExpectedRows() throws EstoreException { capturePeople(new Person("Alice", 17), new Person("Bob", 15)); Table result = db.query("MATCH (p:`org.estore.example.Person`) WHERE p.age > 15 RETURN p"); assertEquals(1, result.getSize()); } @Test - void queryWherePropertyGreaterThanOrEqualsLiteralFiltersExpectedRows() throws Exception { + void queryWherePropertyGreaterThanOrEqualsLiteralFiltersExpectedRows() throws EstoreException { capturePeople(new Person("Alice", 17), new Person("Bob", 15)); Table result = db.query("MATCH (p:`org.estore.example.Person`) WHERE p.age >= 17 RETURN p"); assertEquals(1, result.getSize()); } - private void capturePeople(Person... people) throws Exception { + private void capturePeople(Person... people) throws EstoreException { for (Person person : people) { db.captureAll(person); } diff --git a/estore/src/test/java/org/estore/planner/filter/WhereBooleanLogicTest.java b/estore/src/test/java/org/estore/planner/filter/WhereBooleanLogicTest.java index 89033e0..4cd27c5 100644 --- a/estore/src/test/java/org/estore/planner/filter/WhereBooleanLogicTest.java +++ b/estore/src/test/java/org/estore/planner/filter/WhereBooleanLogicTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.estore.Estore; +import org.estore.EstoreException; import org.estore.example.Person; import org.estore.planner.util.Table; import org.junit.jupiter.api.BeforeEach; @@ -12,12 +13,12 @@ class WhereBooleanLogicTest { private Estore db; @BeforeEach - void setUp() throws Exception { + void setUp() { db = new Estore(WhereBooleanLogicTest.class.getName() + "_" + System.nanoTime()); } @Test - void queryWhereAnd_requiresBothPredicatesTrue() throws Exception { + void queryWhereAnd_requiresBothPredicatesTrue() throws EstoreException { capturePeople(new Person("Alice", 17), new Person("Bob", 15)); Table result = db.query( @@ -26,7 +27,7 @@ void queryWhereAnd_requiresBothPredicatesTrue() throws Exception { } @Test - void queryWhereOr_keepsRowsWhenEitherPredicateIsTrue() throws Exception { + void queryWhereOr_keepsRowsWhenEitherPredicateIsTrue() throws EstoreException { capturePeople(new Person("Alice", 17), new Person("Bob", 15), new Person("Carl", 20)); Table result = db.query( @@ -35,7 +36,7 @@ void queryWhereOr_keepsRowsWhenEitherPredicateIsTrue() throws Exception { } @Test - void queryWhereXor_keepsRowsWhenExactlyOnePredicateIsTrue() throws Exception { + void queryWhereXor_keepsRowsWhenExactlyOnePredicateIsTrue() throws EstoreException { capturePeople(new Person("Alice", 17), new Person("Bob", 17), new Person("Alice", 15)); Table result = db.query( @@ -44,7 +45,7 @@ void queryWhereXor_keepsRowsWhenExactlyOnePredicateIsTrue() throws Exception { } @Test - void queryWhereNot_invertsPredicateTruthValue() throws Exception { + void queryWhereNot_invertsPredicateTruthValue() throws EstoreException { capturePeople(new Person("Alice", 17), new Person("Bob", 15)); Table result = db.query( @@ -52,7 +53,7 @@ void queryWhereNot_invertsPredicateTruthValue() throws Exception { assertEquals(1, result.getSize()); } - private void capturePeople(Person... people) throws Exception { + private void capturePeople(Person... people) throws EstoreException { for (Person person : people) { db.captureAll(person); } diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack100.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack100.java index e9916cf..5533427 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack100.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack100.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.stack.mutable.ArrayStack; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestArrayStack100 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestArrayStack100 { private ArrayList stackData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); arrayStack = new ArrayStack(); stackData = new ArrayList(); diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack1000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack1000.java index 1c5cfe0..0830355 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack1000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack1000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.stack.mutable.ArrayStack; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestArrayStack1000 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestArrayStack1000 { private ArrayList stackData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); arrayStack = new ArrayStack(); stackData = new ArrayList(); diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack10000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack10000.java index 54ff9d8..29eaa3f 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack10000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack10000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.stack.mutable.ArrayStack; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestArrayStack10000 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestArrayStack10000 { private ArrayList stackData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); arrayStack = new ArrayStack(); stackData = new ArrayList(); diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack100000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack100000.java index fe691ca..1353c39 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack100000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestArrayStack100000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.stack.mutable.ArrayStack; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestArrayStack100000 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestArrayStack100000 { private ArrayList stackData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); arrayStack = new ArrayStack(); stackData = new ArrayList(); diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList100.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList100.java index c1f26ce..1383f91 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList100.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList100.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.list.mutable.FastList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestFastList100 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestFastList100 { private FastList fastList; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); fastList = new FastList(); for (int j = 0; j < 100; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList1000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList1000.java index ae8d923..6966b3b 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList1000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList1000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.list.mutable.FastList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestFastList1000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestFastList1000 { private FastList fastList; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); fastList = new FastList(); for (int j = 0; j < 1000; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList10000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList10000.java index 8c2648e..cdab3d5 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList10000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList10000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.list.mutable.FastList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestFastList10000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestFastList10000 { private FastList fastList; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); fastList = new FastList(); for (int j = 0; j < 10000; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList100000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList100000.java index 99664c1..43adee4 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList100000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestFastList100000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.list.mutable.FastList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestFastList100000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestFastList100000 { private FastList fastList; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); fastList = new FastList(); for (int j = 0; j < 100000; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList100.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList100.java index 1865b82..72666ff 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList100.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList100.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.list.immutable.*; import org.junit.jupiter.api.BeforeEach; @@ -10,6 +9,7 @@ import java.util.ArrayList; import org.eclipse.collections.api.list.ImmutableList; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestImmutableArrayList100 { private Estore estore; @@ -18,7 +18,7 @@ public class InGraphReflectionTestImmutableArrayList100 { private ArrayList listData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); listData = new ArrayList(); for (int j = 0; j < 100; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList1000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList1000.java index f10f0c2..6d72235 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList1000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList1000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.list.immutable.*; import org.junit.jupiter.api.BeforeEach; @@ -10,6 +9,7 @@ import java.util.ArrayList; import org.eclipse.collections.api.list.ImmutableList; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestImmutableArrayList1000 { private Estore estore; @@ -18,7 +18,7 @@ public class InGraphReflectionTestImmutableArrayList1000 { private ArrayList listData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); listData = new ArrayList(); for (int j = 0; j < 1000; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList10000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList10000.java index b93eb17..52276da 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList10000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList10000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.list.immutable.*; import org.junit.jupiter.api.BeforeEach; @@ -10,6 +9,7 @@ import java.util.ArrayList; import org.eclipse.collections.api.list.ImmutableList; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestImmutableArrayList10000 { private Estore estore; @@ -18,7 +18,7 @@ public class InGraphReflectionTestImmutableArrayList10000 { private ArrayList listData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); listData = new ArrayList(); for (int j = 0; j < 10000; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList100000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList100000.java index 0025a90..39efcac 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList100000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestImmutableArrayList100000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.list.immutable.*; import org.junit.jupiter.api.BeforeEach; @@ -10,6 +9,7 @@ import java.util.ArrayList; import org.eclipse.collections.api.list.ImmutableList; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestImmutableArrayList100000 { private Estore estore; @@ -18,7 +18,7 @@ public class InGraphReflectionTestImmutableArrayList100000 { private ArrayList listData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); listData = new ArrayList(); for (int j = 0; j < 100000; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap100.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap100.java index 36657eb..2815dde 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap100.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap100.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.map.mutable.UnifiedMap; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestUnifiedMap100 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestUnifiedMap100 { private ArrayList setData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); setData = new ArrayList(); unifiedMap = new UnifiedMap(); diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap1000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap1000.java index 1a30f5c..f197f37 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap1000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap1000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.map.mutable.UnifiedMap; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestUnifiedMap1000 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestUnifiedMap1000 { private ArrayList setData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); setData = new ArrayList(); unifiedMap = new UnifiedMap(); diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap10000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap10000.java index 50744a2..21abaae 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap10000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap10000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.map.mutable.UnifiedMap; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestUnifiedMap10000 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestUnifiedMap10000 { private ArrayList setData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); setData = new ArrayList(); unifiedMap = new UnifiedMap(); diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap100000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap100000.java index a4506b9..e13f9cf 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap100000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedMap100000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.map.mutable.UnifiedMap; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestUnifiedMap100000 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestUnifiedMap100000 { private ArrayList setData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); setData = new ArrayList(); unifiedMap = new UnifiedMap(); diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet100.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet100.java index 89096ff..1c39f21 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet100.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet100.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.set.mutable.UnifiedSet; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestUnifiedSet100 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestUnifiedSet100 { private ArrayList setData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); setData = new ArrayList(); for (int j = 0; j < 100; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet1000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet1000.java index f40848b..a26e1dc 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet1000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet1000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.set.mutable.UnifiedSet; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestUnifiedSet1000 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestUnifiedSet1000 { private ArrayList setData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); setData = new ArrayList(); for (int j = 0; j < 1000; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet10000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet10000.java index e057004..2dda859 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet10000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet10000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.set.mutable.UnifiedSet; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestUnifiedSet10000 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestUnifiedSet10000 { private ArrayList setData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); setData = new ArrayList(); for (int j = 0; j < 10000; j++) { diff --git a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet100000.java b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet100000.java index 1017927..21184af 100644 --- a/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet100000.java +++ b/eval/estore/datastructure/eclipse/src/test/java/org/estore/eval/estore/datastructure/eclipse/InGraphReflectionTestUnifiedSet100000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.eclipse; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import org.eclipse.collections.impl.set.mutable.UnifiedSet; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestUnifiedSet100000 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestUnifiedSet100000 { private ArrayList setData; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); setData = new ArrayList(); for (int j = 0; j < 100000; j++) { diff --git a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable100.java b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable100.java index dba67a8..6c1a7f2 100644 --- a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable100.java +++ b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable100.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.guava; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import com.google.common.collect.ArrayTable; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestArrayTable100 { private Estore estore; @@ -16,7 +16,7 @@ public class InGraphReflectionTestArrayTable100 { private ArrayTable table; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); ArrayList rows = new ArrayList(); ArrayList columns = new ArrayList(); diff --git a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable1000.java b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable1000.java index dd26453..d39a53b 100644 --- a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable1000.java +++ b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable1000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.guava; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import com.google.common.collect.ArrayTable; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestArrayTable1000 { private Estore estore; @@ -16,7 +16,7 @@ public class InGraphReflectionTestArrayTable1000 { private ArrayTable table; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); ArrayList rows = new ArrayList(); ArrayList columns = new ArrayList(); diff --git a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable10000.java b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable10000.java index 390cbd7..71fc6e0 100644 --- a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable10000.java +++ b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable10000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.guava; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import com.google.common.collect.ArrayTable; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestArrayTable10000 { private Estore estore; @@ -16,7 +16,7 @@ public class InGraphReflectionTestArrayTable10000 { private ArrayTable table; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); ArrayList rows = new ArrayList(); ArrayList columns = new ArrayList(); diff --git a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable100000.java b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable100000.java index 1ae50f5..9689b1c 100644 --- a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable100000.java +++ b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestArrayTable100000.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.guava; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import com.google.common.collect.ArrayTable; import org.junit.jupiter.api.BeforeEach; @@ -9,6 +8,7 @@ import java.util.ArrayList; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestArrayTable100000 { private Estore estore; @@ -16,7 +16,7 @@ public class InGraphReflectionTestArrayTable100000 { private ArrayTable table; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); ArrayList rows = new ArrayList(); ArrayList columns = new ArrayList(); diff --git a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestHashMultiset100.java b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestHashMultiset100.java index 8f6e834..c0c7dc1 100644 --- a/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestHashMultiset100.java +++ b/eval/estore/datastructure/guava/src/test/java/org/estore/eval/estore/datastructure/guava/InGraphReflectionTestHashMultiset100.java @@ -1,7 +1,6 @@ package org.estore.eval.estore.datastructure.guava; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import com.google.common.collect.HashMultiset; import com.google.common.collect.HashMultimap; @@ -9,6 +8,7 @@ import org.junit.jupiter.api.Test; import java.util.ArrayList; import org.estore.planner.util.Table; +import org.estore.EstoreException; public class InGraphReflectionTestHashMultiset100 { private Estore estore; @@ -17,7 +17,7 @@ public class InGraphReflectionTestHashMultiset100 { private HashMultimap multiMap; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); ArrayList values = new ArrayList(); multiMap = HashMultimap.create(); diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque100.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque100.java index b64837a..722252a 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque100.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque100.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.ArrayDeque; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestArrayDeque100 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestArrayDeque100 { private ArrayDeque list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new ArrayDeque(); for (int j = 0; j < 100; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque1000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque1000.java index 3f10b06..09f667c 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque1000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque1000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.ArrayDeque; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestArrayDeque1000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestArrayDeque1000 { private ArrayDeque list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new ArrayDeque(); for (int j = 0; j < 1000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque10000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque10000.java index 1451a2d..b744255 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque10000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque10000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.ArrayDeque; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestArrayDeque10000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestArrayDeque10000 { private ArrayDeque list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new ArrayDeque(); for (int j = 0; j < 10000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque100000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque100000.java index 2362f11..779d8e2 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque100000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayDeque100000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.ArrayDeque; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestArrayDeque100000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestArrayDeque100000 { private ArrayDeque list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new ArrayDeque(); for (int j = 0; j < 100000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList100.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList100.java index 2a3efbf..2cb72ed 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList100.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList100.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestArrayList100 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestArrayList100 { private ArrayList list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new ArrayList(); for (int j = 0; j < 100; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList1000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList1000.java index cf4d8be..2a7f3ba 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList1000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList1000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.Random; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestArrayList1000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestArrayList1000 { private ArrayList list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = new Random(); list = new ArrayList(); for (int j = 0; j < 1000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList10000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList10000.java index a9ec68b..e45d3c2 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList10000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList10000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestArrayList10000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestArrayList10000 { private ArrayList list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new ArrayList(); for (int j = 0; j < 10000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList100000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList100000.java index 9786e56..83bfce5 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList100000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList100000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestArrayList100000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestArrayList100000 { private ArrayList list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new ArrayList(); for (int j = 0; j < 100000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList1000000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList1000000.java index 4b02a17..be719ad 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList1000000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestArrayList1000000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestArrayList1000000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestArrayList1000000 { private ArrayList list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new ArrayList(); for (int j = 0; j < 1000000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap100.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap100.java index 0fdf4d4..f1684b2 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap100.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap100.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.HashMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestHashMap100 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestHashMap100 { private HashMap map; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); map = new HashMap(); while (map.size() != 99) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap1000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap1000.java index 93fa7a1..e93db3e 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap1000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap1000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.HashMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestHashMap1000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestHashMap1000 { private HashMap map; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); map = new HashMap(); while (map.size() != 999) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap10000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap10000.java index 5680764..605667d 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap10000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap10000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.HashMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestHashMap10000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestHashMap10000 { private HashMap map; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); map = new HashMap(); while (map.size() != 9999) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap100000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap100000.java index 326c40a..2133cf0 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap100000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestHashMap100000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.HashMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTestHashMap100000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestHashMap100000 { private HashMap map; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); map = new HashMap(); while (map.size() != 99999) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList100.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList100.java index af4296b..15ea868 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList100.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList100.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.LinkedList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestLinkedList100 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestLinkedList100 { private LinkedList list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new LinkedList(); for (int j = 0; j < 100; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList1000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList1000.java index b1b66bc..48fe2c0 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList1000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList1000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.LinkedList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestLinkedList1000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestLinkedList1000 { private LinkedList list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new LinkedList(); for (int j = 0; j < 1000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList10000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList10000.java index 631ffbb..08232e0 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList10000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList10000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.LinkedList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestLinkedList10000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestLinkedList10000 { private LinkedList list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new LinkedList(); for (int j = 0; j < 10000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList100000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList100000.java index 141d9d2..165c3c8 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList100000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestLinkedList100000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.LinkedList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestLinkedList100000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestLinkedList100000 { private LinkedList list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new LinkedList(); for (int j = 0; j < 100000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector100.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector100.java index 289c7a7..4673fee 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector100.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector100.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.Vector; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestVector100 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestVector100 { private Vector list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new Vector(); for (int j = 0; j < 100; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector1000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector1000.java index 1a4eed4..6356234 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector1000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector1000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.Vector; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestVector1000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestVector1000 { private Vector list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new Vector(); for (int j = 0; j < 1000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector10000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector10000.java index b9f8044..48e88f2 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector10000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector10000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.Vector; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestVector10000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestVector10000 { private Vector list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new Vector(); for (int j = 0; j < 10000; j++) { diff --git a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector100000.java b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector100000.java index 2fe8073..c2e2d88 100644 --- a/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector100000.java +++ b/eval/estore/datastructure/jcf/src/test/java/org/estore/eval/estore/datastructure/jcf/InGraphReflectionTestVector100000.java @@ -1,13 +1,13 @@ package org.estore.eval.estore.datastructure.jcf; import org.estore.Estore; -import org.estore.EstoreOptions; import java.util.concurrent.ThreadLocalRandom; import java.util.Vector; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.estore.EstoreException; public class InGraphReflectionTestVector100000 { private Estore estore; @@ -15,7 +15,7 @@ public class InGraphReflectionTestVector100000 { private Vector list; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { rand = ThreadLocalRandom.current(); list = new Vector(); for (int j = 0; j < 100000; j++) { diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest001.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest001.java index 412a968..be7351a 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest001.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest001.java @@ -205,7 +205,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { try { dbFactory = new DatabaseFactory("ArcadeDB/database"); db = dbFactory.create(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest01.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest01.java index 3980841..1366007 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest01.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest01.java @@ -206,7 +206,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { try { dbFactory = new DatabaseFactory("ArcadeDB/database"); db = dbFactory.create(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest03.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest03.java index 12651d9..4efba67 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest03.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest03.java @@ -206,7 +206,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { try { dbFactory = new DatabaseFactory("ArcadeDB/database"); db = dbFactory.create(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest10.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest10.java index 0599012..4f9cbbc 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest10.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest10.java @@ -206,7 +206,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { try { dbFactory = new DatabaseFactory("ArcadeDB/database"); db = dbFactory.create(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest3.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest3.java index 375897e..43e19ed 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest3.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/ArcadeDBEmbeddedTest3.java @@ -206,7 +206,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { try { dbFactory = new DatabaseFactory("ArcadeDB/database"); db = dbFactory.create(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest001.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest001.java index 9dcbddc..ba49c38 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest001.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest001.java @@ -15,13 +15,14 @@ import org.estore.Estore; import org.estore.EstoreOptions; import org.estore.planner.util.Table; +import org.estore.EstoreException; public class InGraphReflectionTest001 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); @@ -103,7 +104,7 @@ public void testTsr1() { result.print(); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest01.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest01.java index 7388ff3..63e323e 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest01.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest01.java @@ -17,13 +17,14 @@ import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTest01 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); @@ -107,7 +108,7 @@ public void testTsr1() { assertEquals(result.get("account.accountType").get(0), "certificate of deposit"); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest03.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest03.java index 09d32b3..62b5948 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest03.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest03.java @@ -15,13 +15,14 @@ import org.estore.Estore; import org.estore.EstoreOptions; import org.estore.planner.util.Table; +import org.estore.EstoreException; public class InGraphReflectionTest03 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); @@ -102,7 +103,7 @@ public void testTsr1() { + " account.accountType"); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest10.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest10.java index dd36587..3c60562 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest10.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest10.java @@ -15,13 +15,14 @@ import org.estore.Estore; import org.estore.EstoreOptions; import org.estore.planner.util.Table; +import org.estore.EstoreException; public class InGraphReflectionTest10 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); @@ -102,7 +103,7 @@ public void testTsr1() { + " account.accountType"); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest3.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest3.java index d4a415d..3953cfd 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest3.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/InGraphReflectionTest3.java @@ -15,13 +15,14 @@ import org.estore.Estore; import org.estore.EstoreOptions; import org.estore.planner.util.Table; +import org.estore.EstoreException; public class InGraphReflectionTest3 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); @@ -102,7 +103,7 @@ public void testTsr1() { + " account.accountType"); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest001.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest001.java index 7d9d89e..3caf3c7 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest001.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest001.java @@ -180,7 +180,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/sf0.01"; HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest01.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest01.java index 80473d2..714fff3 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest01.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest01.java @@ -163,7 +163,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/sf0.1"; HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest03.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest03.java index 2f51dfc..26cb86f 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest03.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest03.java @@ -163,7 +163,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/sf0.3"; HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest10.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest10.java index 351b634..3084434 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest10.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest10.java @@ -163,7 +163,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/sf10"; HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest3.java b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest3.java index 4bd6156..b47eb4c 100644 --- a/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest3.java +++ b/eval/estore/ldbc/finbench/src/test/java/org/estore/eval/estore/ldbc/finbench/Neo4jImpermanantTest3.java @@ -163,7 +163,7 @@ public void testTsr1() { } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/sf3"; HashMap accounts = new HashMap(); HashMap companys = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest01.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest01.java index 6a3ecbe..3763916 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest01.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest01.java @@ -17,13 +17,14 @@ import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTest01 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); } @@ -129,7 +130,7 @@ public void testInteractiveUpdateQuery8() { assertEquals(result.get("COUNT(r)").get(0), 1); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap places = new HashMap(); HashMap tags = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest03.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest03.java index 271d83e..3956fde 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest03.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest03.java @@ -17,13 +17,14 @@ import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTest03 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); } @@ -139,7 +140,7 @@ public void testInteractiveUpdateQuery8() { assertEquals(result.get("COUNT(r)").get(0), 1); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap places = new HashMap(); HashMap tags = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest1.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest1.java index 67afbdb..75cb4cd 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest1.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest1.java @@ -17,13 +17,14 @@ import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTest1 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); } @@ -139,7 +140,7 @@ public void testInteractiveUpdateQuery8() { assertEquals(result.get("COUNT(r)").get(0), 1); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap places = new HashMap(); HashMap tags = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest10.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest10.java index cc5498e..dc1b550 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest10.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest10.java @@ -17,13 +17,14 @@ import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTest10 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); } @@ -138,7 +139,7 @@ public void testInteractiveUpdateQuery8() { assertEquals(result.get("COUNT(r)").get(0), 1); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap places = new HashMap(); HashMap tags = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest3.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest3.java index a278be3..3432dfe 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest3.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/InGraphReflectionTest3.java @@ -17,13 +17,14 @@ import org.estore.planner.util.Table; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.estore.EstoreException; public class InGraphReflectionTest3 { private Estore estore; @BeforeEach - public void setupData() throws Exception { + public void setupData() throws EstoreException { estore = new Estore("myDb", new EstoreOptions().profile(true)); readDataSet(); } @@ -138,7 +139,7 @@ public void testInteractiveUpdateQuery8() { assertEquals(result.get("COUNT(r)").get(0), 1); } - public void readDataSet() throws Exception { + public void readDataSet() throws EstoreException { HashMap persons = new HashMap(); HashMap places = new HashMap(); HashMap tags = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest01.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest01.java index 5f7ecd5..1067089 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest01.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest01.java @@ -188,7 +188,7 @@ public void testInteractiveUpdateQuery8() { } } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/social_network-csv_composite-longdateformatter-sf0.1"; HashMap places = new HashMap(); HashMap tagclasses = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest03.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest03.java index 2542127..ded21f8 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest03.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest03.java @@ -189,7 +189,7 @@ public void testInteractiveUpdateQuery8() { } } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/social_network-csv_composite-longdateformatter-sf0.3"; HashMap places = new HashMap(); HashMap tagclasses = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest1.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest1.java index 642f4f8..6655467 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest1.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest1.java @@ -189,7 +189,7 @@ public void testInteractiveUpdateQuery8() { } } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/social_network-csv_composite-longdateformatter-sf1"; HashMap places = new HashMap(); HashMap tagclasses = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest10.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest10.java index f1dc67a..e7a0f33 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest10.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest10.java @@ -190,7 +190,7 @@ public void testInteractiveUpdateQuery8() { } } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/social_network-csv_composite-longdateformatter-sf10"; HashMap places = new HashMap(); HashMap tagclasses = new HashMap(); diff --git a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest3.java b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest3.java index b2e81eb..1e29d17 100644 --- a/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest3.java +++ b/eval/estore/ldbc/snb/src/test/java/org/estore/eval/estore/ldbc/snb/Neo4jImpermanantTest3.java @@ -189,7 +189,7 @@ public void testInteractiveUpdateQuery8() { } } @BeforeEach - public void setupData() throws Exception { + public void setupData() { String datasetPath = "/social_network-csv_composite-longdateformatter-sf3"; HashMap places = new HashMap(); HashMap tagclasses = new HashMap(); diff --git a/eval/estore/metadata/h2/src/test/java/org/estore/eval/estore/metadata/h2/InGraphReflectionMetaDataTest.java b/eval/estore/metadata/h2/src/test/java/org/estore/eval/estore/metadata/h2/InGraphReflectionMetaDataTest.java index aab5a1d..eacfab4 100644 --- a/eval/estore/metadata/h2/src/test/java/org/estore/eval/estore/metadata/h2/InGraphReflectionMetaDataTest.java +++ b/eval/estore/metadata/h2/src/test/java/org/estore/eval/estore/metadata/h2/InGraphReflectionMetaDataTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.estore.Estore; -import org.estore.EstoreOptions; +import org.estore.EstoreException; import org.estore.planner.util.Table; import java.sql.Connection; @@ -14,6 +14,7 @@ import java.util.Set; import static org.junit.jupiter.api.Assertions.*; +import java.sql.SQLException; public class InGraphReflectionMetaDataTest { @@ -21,13 +22,13 @@ public class InGraphReflectionMetaDataTest { private Estore estore1; @BeforeEach - public void setup() throws Exception { + public void setup() throws SQLException { estore1 = new Estore("estoreTestDb1"); conn1 = DriverManager.getConnection("jdbc:h2:mem:h2TestDb1", "sa", ""); } @Test - public void testH2DbNameQuery() throws Exception { + public void testH2DbNameQuery() throws ClassNotFoundException, EstoreException { // insert H2 Engine into estore Class t = Class.forName("org.h2.engine.Engine"); estore1.captureAll(t); @@ -47,7 +48,7 @@ public void testH2DbNameQuery() throws Exception { } @Test - public void testH2TablesQuery() throws Exception { + public void testH2TablesQuery() throws ClassNotFoundException, SQLException, EstoreException { // Create new tables Statement stmt = conn1.createStatement(); stmt.execute("CREATE TABLE IF NOT EXISTS TEST_TABLE1 (ID INT PRIMARY KEY, NAME VARCHAR(255))"); @@ -75,7 +76,7 @@ public void testH2TablesQuery() throws Exception { } @Test - public void testH2UsersQuery() throws Exception { + public void testH2UsersQuery() throws ClassNotFoundException, SQLException { // create new user Statement stmt = conn1.createStatement(); stmt.execute("CREATE USER IF NOT EXISTS USER1 PASSWORD 'password1'"); @@ -104,7 +105,7 @@ public void testH2UsersQuery() throws Exception { } @AfterEach - public void drop() throws Exception { + public void drop() throws SQLException { if (conn1 != null) { conn1.close(); } diff --git a/eval/estore/metadata/h2/src/test/java/org/estore/eval/estore/metadata/h2/JDBCMetaDataTest.java b/eval/estore/metadata/h2/src/test/java/org/estore/eval/estore/metadata/h2/JDBCMetaDataTest.java index f021ca1..7fb9e1e 100644 --- a/eval/estore/metadata/h2/src/test/java/org/estore/eval/estore/metadata/h2/JDBCMetaDataTest.java +++ b/eval/estore/metadata/h2/src/test/java/org/estore/eval/estore/metadata/h2/JDBCMetaDataTest.java @@ -13,24 +13,25 @@ import java.util.Set; import static org.junit.jupiter.api.Assertions.*; +import java.sql.SQLException; public class JDBCMetaDataTest { private Connection conn1; @BeforeEach - public void setup() throws Exception { + public void setup() throws SQLException { conn1 = DriverManager.getConnection("jdbc:h2:mem:h2TestDb1", "sa", ""); } @Test - public void testH2DbNameQuery() throws Exception { + public void testH2DbNameQuery() { // placeholder; no api for this query System.out.println("Execution Time : 0"); } @Test - public void testH2TablesQuery() throws Exception { + public void testH2TablesQuery() throws SQLException { Set tablesSet = new HashSet<>(); // Create a new table and check that it exists @@ -52,7 +53,7 @@ public void testH2TablesQuery() throws Exception { } @Test - public void testH2UsersQuery() throws Exception { + public void testH2UsersQuery() throws SQLException { long t1 = System.nanoTime(); DatabaseMetaData meta = conn1.getMetaData(); String userName = meta.getUserName(); @@ -62,7 +63,7 @@ public void testH2UsersQuery() throws Exception { } @AfterEach - public void drop() throws Exception { + public void drop() throws SQLException { if (conn1 != null) { conn1.close(); }