From 96a2388984d0d064d84e21a1f3642a4b4ae30195 Mon Sep 17 00:00:00 2001 From: Tglman Date: Wed, 23 Oct 2024 22:52:02 +0100 Subject: [PATCH] refactor(test): reduced usage of legacy query engine in tests --- .../test/database/auto/GraphDatabaseTest.java | 3 +- .../test/database/auto/SQLInsertTest.java | 22 +++--- .../test/database/auto/SQLUpdateTest.java | 73 ++++++++++--------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/GraphDatabaseTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/GraphDatabaseTest.java index 8f4ef370e5e..7c266c149d6 100755 --- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/GraphDatabaseTest.java +++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/GraphDatabaseTest.java @@ -23,7 +23,6 @@ import com.orientechnologies.orient.core.record.OElement; import com.orientechnologies.orient.core.record.OVertex; import com.orientechnologies.orient.core.record.impl.ODocument; -import com.orientechnologies.orient.core.sql.OCommandSQL; import com.orientechnologies.orient.core.sql.executor.OResult; import com.orientechnologies.orient.core.sql.executor.OResultSet; import java.io.IOException; @@ -366,7 +365,7 @@ public void testDeleteOfVerticesAndEdgesWithDeleteCommandAndUnsafe() { public void testInsertOfEdgeWithInsertCommand() { try { - database.command(new OCommandSQL("insert into E set a = 33")).execute(); + database.command("insert into E set a = 33").close(); Assert.assertTrue(false); } catch (OCommandExecutionException e) { Assert.assertTrue(true); diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLInsertTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLInsertTest.java index c2193646621..1a92f90682e 100644 --- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLInsertTest.java +++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLInsertTest.java @@ -327,12 +327,13 @@ public void insertSubQuery() { @Test(dependsOnMethods = "insertOperator") public void insertCluster() { ODocument doc = - database - .command( - new OCommandSQL( + (ODocument) + database + .command( "insert into Account cluster anotherdefault (id, title) values (10, 'NoSQL" - + " movement')")) - .execute(); + + " movement')") + .next() + .toElement(); Assert.assertTrue(doc != null); Assert.assertEquals( @@ -628,12 +629,13 @@ public void testAutoConversionOfEmbeddededNoLinkedClass() { c.createProperty("embeddedNoLinkedClass", OType.EMBEDDED); ODocument doc = - database - .command( - new OCommandSQL( + (ODocument) + database + .command( "INSERT INTO TestConvert SET name = 'embeddedNoLinkedClass'," - + " embeddedNoLinkedClass = {'line1':'123 Fake Street'}")) - .execute(); + + " embeddedNoLinkedClass = {'line1':'123 Fake Street'}") + .next() + .toElement(); Assert.assertTrue(doc.field("embeddedNoLinkedClass") instanceof ODocument); } diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLUpdateTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLUpdateTest.java index bbbbdddcd53..685d1b3e042 100644 --- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLUpdateTest.java +++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLUpdateTest.java @@ -184,23 +184,23 @@ public void updateCollectionsWithSetOperator() { @Test(dependsOnMethods = "updateCollectionsRemoveWithWhereOperator") public void updateMapsWithSetOperator() { - ODocument doc = + OElement doc = database .command( - new OCommandSQL( - "insert into cluster:default (equaledges, name, properties) values ('no'," - + " 'circleUpdate', {'round':'eeee', 'blaaa':'zigzag'} )")) - .execute(); + "insert into cluster:default (equaledges, name, properties) values ('no'," + + " 'circleUpdate', {'round':'eeee', 'blaaa':'zigzag'} )") + .next() + .toElement(); - Integer records = + Long records = database .command( - new OCommandSQL( - "update " - + doc.getIdentity() - + " set properties = {'roundOne':'ffff'," - + " 'bla':'zagzig','testTestTEST':'okOkOK'}")) - .execute(); + "update " + + doc.getIdentity() + + " set properties = {'roundOne':'ffff'," + + " 'bla':'zagzig','testTestTEST':'okOkOK'}") + .next() + .getProperty("count"); Assert.assertEquals(records.intValue(), 1); @@ -223,23 +223,23 @@ public void updateMapsWithSetOperator() { @Test(dependsOnMethods = "updateCollectionsRemoveWithWhereOperator") public void updateMapsWithPutOperatorAndWhere() { - ODocument doc = + OElement doc = database .command( - new OCommandSQL( - "insert into cluster:default (equaledges, name, properties) values ('no'," - + " 'updateMapsWithPutOperatorAndWhere', {} )")) - .execute(); + "insert into cluster:default (equaledges, name, properties) values ('no'," + + " 'updateMapsWithPutOperatorAndWhere', {} )") + .next() + .toElement(); - Integer records = + Long records = database .command( - new OCommandSQL( - "update " - + doc.getIdentity() - + " put properties = 'one', 'two' where name =" - + " 'updateMapsWithPutOperatorAndWhere'")) - .execute(); + "update " + + doc.getIdentity() + + " set properties['one']= 'two' where name =" + + " 'updateMapsWithPutOperatorAndWhere'") + .next() + .getProperty("count"); Assert.assertEquals(records.intValue(), 1); @@ -286,7 +286,7 @@ public void updateWithWildcardsOnSetAndWhere() { doc.field("name", "Raf"); doc.field("city", "Torino"); doc.field("gender", "fmale"); - doc.save(); + database.save(doc); checkUpdatedDoc(database, "Raf", "Torino", "fmale"); /* THESE COMMANDS ARE OK */ @@ -468,7 +468,7 @@ public void testEscaping() { schema.createClass("FormatEscapingTest"); final ODocument document = new ODocument("FormatEscapingTest"); - document.save(); + database.save(document); database .command( @@ -476,7 +476,7 @@ public void testEscaping() { + document.getIdentity()) .close(); - document.reload(); + database.reload(document); Assert.assertEquals(document.field("test"), "aaa ' bbb"); @@ -487,7 +487,7 @@ public void testEscaping() { + document.getIdentity()) .close(); - document.reload(); + database.reload(document); Assert.assertEquals(document.field("test"), "ccc ' eee"); Assert.assertEquals(document.field("test2"), "aaa ' bbb"); @@ -497,7 +497,7 @@ public void testEscaping() { + document.getIdentity()) .close(); - document.reload(); + database.reload(document); Assert.assertEquals(document.field("test"), "aaa \n bbb"); database @@ -506,7 +506,7 @@ public void testEscaping() { + document.getIdentity()) .close(); - document.reload(); + database.reload(document); Assert.assertEquals(document.field("test"), "aaa \r bbb"); database @@ -516,7 +516,7 @@ public void testEscaping() { + document.getIdentity())) .execute(); - document.reload(); + database.reload(document); Assert.assertEquals(document.field("test"), "aaa \b bbb"); database @@ -525,7 +525,7 @@ public void testEscaping() { + document.getIdentity()) .close(); - document.reload(); + database.reload(document); Assert.assertEquals(document.field("test"), "aaa \t bbb"); database @@ -535,7 +535,7 @@ public void testEscaping() { + document.getIdentity())) .execute(); - document.reload(); + database.reload(document); Assert.assertEquals(document.field("test"), "aaa \f bbb"); } @@ -664,7 +664,8 @@ private List getValidPositions(int clusterId) { } public void testMultiplePut() { - final ODocument v = database.newInstance("V").save(); + final ODocument v = database.newInstance("V"); + database.save(v); Long records = database @@ -677,7 +678,7 @@ public void testMultiplePut() { Assert.assertEquals(records.intValue(), 1); - v.reload(); + database.reload(v); Assert.assertTrue(v.field("embmap") instanceof Map); Assert.assertEquals(((Map) v.field("embmap")).size(), 2); @@ -721,7 +722,7 @@ public void testAutoConversionOfEmbeddededListWithLinkedClass() { + " [{'line1':'123 Fake Street'}]") .close(); - doc.reload(); + database.reload(doc); Assert.assertTrue(doc.getProperty("embeddedListWithLinkedClass") instanceof List); Assert.assertEquals(((Collection) doc.getProperty("embeddedListWithLinkedClass")).size(), 3);