From f6e79e62d655f9323dcfa1e0201c4dad2a1328c0 Mon Sep 17 00:00:00 2001 From: Tglman Date: Fri, 4 Oct 2024 14:45:04 +0100 Subject: [PATCH] refactor(test): reduced use of deprecated APIs in test cases --- .../orient/test/database/auto/JSONTest.java | 8 +- .../test/database/auto/SQLInsertTest.java | 14 +- .../test/database/auto/TraverseTest.java | 223 +++++++++--------- 3 files changed, 117 insertions(+), 128 deletions(-) diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONTest.java index fa947f0e19a..937226cd408 100755 --- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONTest.java +++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONTest.java @@ -461,14 +461,14 @@ public void testToJSONWithNoLazyLoadAndClosedDatabase() { String jsonFull = doc.toJSON(); ORID rid = doc.getIdentity(); database.close(); - database.open("admin", "admin"); + reopendb("admin", "admin"); doc = database.load(rid); doc.setLazyLoad(false); doc.reload("*:0"); database.close(); String jsonLoaded = doc.toJSON(); Assert.assertEquals(jsonLoaded, jsonFull); - database.open("admin", "admin"); + reopendb("admin", "admin"); doc = database.load(rid); doc.setLazyLoad(false); doc.load("*:0"); @@ -478,14 +478,14 @@ public void testToJSONWithNoLazyLoadAndClosedDatabase() { Assert.assertEquals(jsonLoaded, jsonFull); } - if (database.isClosed()) database.open("admin", "admin"); + if (database.isClosed()) reopendb("admin", "admin"); for (ODocument doc : result) { doc.reload("*:1"); String jsonFull = doc.toJSON(); ORID rid = doc.getIdentity(); database.close(); - database.open("admin", "admin"); + reopendb("admin", "admin"); doc = database.load(rid); doc.setLazyLoad(false); doc.reload("*:1"); 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 0de92f6ae45..c2193646621 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 @@ -30,7 +30,6 @@ import com.orientechnologies.orient.core.sql.OCommandSQL; import com.orientechnologies.orient.core.sql.executor.OResult; import com.orientechnologies.orient.core.sql.executor.OResultSet; -import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; @@ -73,7 +72,7 @@ public void insertOperator() { int addressId = database.getMetadata().getSchema().getClass("Address").getDefaultClusterId(); for (int i = 0; i < 30; i++) { - new ODocument("Address").save(); + database.save(new ODocument("Address")); } List positions = getValidPositions(addressId); @@ -179,7 +178,6 @@ public void insertWithWildcards() { } @Test - @SuppressWarnings("unchecked") public void insertMap() { OElement doc = database @@ -231,7 +229,6 @@ public void insertMap() { } @Test - @SuppressWarnings("unchecked") public void insertList() { OElement doc = database @@ -386,12 +383,11 @@ public void insertSelect() { .count(); Assert.assertEquals(inserted, 2); - List result = - database.query(new OSQLSynchQuery("select from UserCopy")); + List result = database.query("select from UserCopy").stream().toList(); Assert.assertEquals(result.size(), 2); - for (OIdentifiable r : result) { - Assert.assertEquals(((ODocument) r.getRecord()).getClassName(), "UserCopy"); - Assert.assertNotSame(((ODocument) r.getRecord()).field("name"), "admin"); + for (OResult r : result) { + Assert.assertEquals(r.getElement().get().getSchemaType().get().getName(), "UserCopy"); + Assert.assertNotSame(r.getProperty("name"), "admin"); } } diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TraverseTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TraverseTest.java index f23caf100f5..185de069c0b 100755 --- a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TraverseTest.java +++ b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/TraverseTest.java @@ -22,9 +22,9 @@ import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal; import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal; import com.orientechnologies.orient.core.db.record.OIdentifiable; -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.executor.OResult; import com.orientechnologies.orient.core.sql.filter.OSQLPredicate; import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery; import java.util.HashMap; @@ -128,10 +128,8 @@ public void init() { } public void traverseSQLAllFromActorNoWhere() { - List result1 = - database - .command(new OSQLSynchQuery("traverse * from " + tomCruise.getIdentity())) - .execute(); + List result1 = + database.command("traverse * from " + tomCruise.getIdentity()).stream().toList(); Assert.assertEquals(result1.size(), totalElements); } @@ -143,12 +141,11 @@ public void traverseAPIAllFromActorNoWhere() { @Test public void traverseSQLOutFromActor1Depth() { - List result1 = + List result1 = database - .command( - new OSQLSynchQuery( - "traverse out_ from " + tomCruise.getIdentity() + " while $depth <= 1")) - .execute(); + .command("traverse out_ from " + tomCruise.getIdentity() + " while $depth <= 1") + .stream() + .toList(); Assert.assertTrue(result1.size() != 0); } @@ -169,118 +166,119 @@ public void traverseSQLMoviesOnly() { @Test public void traverseSQLPerClassFields() { - List result1 = + List result1 = database .command( - new OSQLSynchQuery( - "select from ( traverse out() from " - + tomCruise.getIdentity() - + ") where @class = 'Movie'")) - .execute(); + "select from ( traverse out() from " + + tomCruise.getIdentity() + + ") where @class = 'Movie'") + .stream() + .toList(); Assert.assertTrue(result1.size() > 0); - for (OElement d : result1) { - Assert.assertEquals(d.getSchemaType().map(x -> x.getName()).orElse(null), "Movie"); + for (OResult d : result1) { + Assert.assertEquals( + d.toElement().getSchemaType().map(x -> x.getName()).orElse(null), "Movie"); } } @Test public void traverseSQLMoviesOnlyDepth() { - List result1 = + List result1 = database .command( - new OSQLSynchQuery( - "select from ( traverse * from " - + tomCruise.getIdentity() - + " while $depth <= 1 ) where @class = 'Movie'")) - .execute(); + "select from ( traverse * from " + + tomCruise.getIdentity() + + " while $depth <= 1 ) where @class = 'Movie'") + .stream() + .toList(); Assert.assertTrue(result1.isEmpty()); - List result2 = + List result2 = database .command( - new OSQLSynchQuery( - "select from ( traverse * from " - + tomCruise.getIdentity() - + " while $depth <= 2 ) where @class = 'Movie'")) - .execute(); + "select from ( traverse * from " + + tomCruise.getIdentity() + + " while $depth <= 2 ) where @class = 'Movie'") + .stream() + .toList(); Assert.assertTrue(result2.size() > 0); - for (ODocument d : result2) { - Assert.assertEquals(d.getClassName(), "Movie"); + for (OResult d : result2) { + Assert.assertEquals( + d.toElement().getSchemaType().map(x -> x.getName()).orElse(null), "Movie"); } - List result3 = + List result3 = database .command( - new OSQLSynchQuery( - "select from ( traverse * from " - + tomCruise.getIdentity() - + " ) where @class = 'Movie'")) - .execute(); + "select from ( traverse * from " + + tomCruise.getIdentity() + + " ) where @class = 'Movie'") + .stream() + .toList(); Assert.assertTrue(result3.size() > 0); Assert.assertTrue(result3.size() > result2.size()); - for (ODocument d : result3) { - Assert.assertEquals(d.getClassName(), "Movie"); + for (OResult d : result3) { + Assert.assertEquals( + d.toElement().getSchemaType().map(x -> x.getName()).orElse(null), "Movie"); } } @Test public void traverseSelect() { - List result1 = - database - .command(new OSQLSynchQuery("traverse * from ( select from Movie )")) - .execute(); + List result1 = + database.command("traverse * from ( select from Movie )").stream().toList(); Assert.assertEquals(result1.size(), totalElements); } @Test public void traverseSQLSelectAndTraverseNested() { - List result1 = + List result1 = database .command( - new OSQLSynchQuery( - "traverse * from ( select from ( traverse * from " - + tomCruise.getIdentity() - + " while $depth <= 2 ) where @class = 'Movie' )")) - .execute(); + "traverse * from ( select from ( traverse * from " + + tomCruise.getIdentity() + + " while $depth <= 2 ) where @class = 'Movie' )") + .stream() + .toList(); Assert.assertEquals(result1.size(), totalElements); } @Test public void traverseAPISelectAndTraverseNested() { - List result1 = + List result1 = database .command( - new OSQLSynchQuery( - "traverse * from ( select from ( traverse * from " - + tomCruise.getIdentity() - + " while $depth <= 2 ) where @class = 'Movie' )")) - .execute(); + "traverse * from ( select from ( traverse * from " + + tomCruise.getIdentity() + + " while $depth <= 2 ) where @class = 'Movie' )") + .stream() + .toList(); Assert.assertEquals(result1.size(), totalElements); } @Test public void traverseAPISelectAndTraverseNestedDepthFirst() { - List result1 = + List result1 = database .command( - new OSQLSynchQuery( - "traverse * from ( select from ( traverse * from " - + tomCruise.getIdentity() - + " while $depth <= 2 strategy depth_first ) where @class = 'Movie' )")) - .execute(); + "traverse * from ( select from ( traverse * from " + + tomCruise.getIdentity() + + " while $depth <= 2 strategy depth_first ) where @class = 'Movie' )") + .stream() + .toList(); Assert.assertEquals(result1.size(), totalElements); } @Test public void traverseAPISelectAndTraverseNestedBreadthFirst() { - List result1 = + List result1 = database .command( - new OSQLSynchQuery( - "traverse * from ( select from ( traverse * from " - + tomCruise.getIdentity() - + " while $depth <= 2 strategy breadth_first ) where @class = 'Movie' )")) - .execute(); + "traverse * from ( select from ( traverse * from " + + tomCruise.getIdentity() + + " while $depth <= 2 strategy breadth_first ) where @class = 'Movie' )") + .stream() + .toList(); Assert.assertEquals(result1.size(), totalElements); } @@ -337,29 +335,23 @@ public void traverseSelectIterable() { @Test public void traverseSelectNoInfluence() { - List result1 = + List result1 = + database.command("traverse * from Movie while $depth < 2").stream().toList(); + List result2 = + database.command("select from ( traverse * from Movie while $depth < 2 )").stream() + .toList(); + List result3 = database - .command(new OSQLSynchQuery("traverse any() from Movie while $depth < 2")) - .execute(); - List result2 = + .command("select from ( traverse * from Movie while $depth < 2 ) where true") + .stream() + .toList(); + List result4 = database .command( - new OSQLSynchQuery( - "select from ( traverse any() from Movie while $depth < 2 )")) - .execute(); - List result3 = - database - .command( - new OSQLSynchQuery( - "select from ( traverse any() from Movie while $depth < 2 ) where true")) - .execute(); - List result4 = - database - .command( - new OSQLSynchQuery( - "select from ( traverse any() from Movie while $depth < 2 and ( true = true ) )" - + " where true")) - .execute(); + "select from ( traverse * from Movie while $depth < 2 and ( true = true ) )" + + " where true") + .stream() + .toList(); Assert.assertEquals(result1, result2); Assert.assertEquals(result1, result3); @@ -379,18 +371,18 @@ public void traverseNoConditionLimit1() { @Test public void traverseAndFilterByAttributeThatContainsDotInValue() { // issue #4952 - List result1 = + List result1 = database .command( - new OSQLSynchQuery( - "select from ( traverse out_married, in[attributeWithDotValue = 'a.b'] from " - + tomCruise.getIdentity() - + ")")) - .execute(); + "select from ( traverse out_married, in[attributeWithDotValue = 'a.b'] from " + + tomCruise.getIdentity() + + ")") + .stream() + .toList(); Assert.assertTrue(result1.size() > 0); boolean found = false; - for (ODocument doc : result1) { - String name = doc.field("name"); + for (OResult doc : result1) { + String name = doc.getProperty("name"); if ("Nicole Kidman".equals(name)) { found = true; break; @@ -404,18 +396,19 @@ public void traverseAndFilterWithNamedParam() { // issue #5225 Map params = new HashMap(); params.put("param1", "a.b"); - List result1 = + List result1 = database .command( - new OSQLSynchQuery( - "select from (traverse out_married, in[attributeWithDotValue = :param1] from " - + tomCruise.getIdentity() - + ")")) - .execute(params); + "select from (traverse out_married, in[attributeWithDotValue = :param1] from " + + tomCruise.getIdentity() + + ")", + params) + .stream() + .toList(); Assert.assertTrue(result1.size() > 0); boolean found = false; - for (ODocument doc : result1) { - String name = doc.field("name"); + for (OResult doc : result1) { + String name = doc.getProperty("name"); if ("Nicole Kidman".equals(name)) { found = true; break; @@ -426,19 +419,19 @@ public void traverseAndFilterWithNamedParam() { @Test public void traverseAndCheckDepthInSelect() { - List result1 = + List result1 = database .command( - new OSQLSynchQuery( - "select *, $depth as d from ( traverse out_married from " - + tomCruise.getIdentity() - + " while $depth < 2)")) - .execute(); + "select *, $depth as d from ( traverse out_married from " + + tomCruise.getIdentity() + + " while $depth < 2)") + .stream() + .toList(); Assert.assertEquals(result1.size(), 2); boolean found = false; Integer i = 0; - for (ODocument doc : result1) { - Integer depth = doc.field("d"); + for (OResult doc : result1) { + Integer depth = doc.getProperty("d"); Assert.assertEquals(depth, i++); } } @@ -451,12 +444,12 @@ public void traverseAndCheckReturn() { String q = "traverse in('married') from " + nicoleKidman.getIdentity() + ""; ODatabaseDocumentInternal db = (ODatabaseDocumentInternal) database.copy(); ODatabaseRecordThreadLocal.instance().set(db); - List result1 = db.command(new OSQLSynchQuery(q)).execute(); + List result1 = db.command(q).stream().toList(); Assert.assertEquals(result1.size(), 2); boolean found = false; Integer i = 0; - for (Object doc : result1) { - Assert.assertTrue(((OElement) doc).isVertex()); + for (OResult doc : result1) { + Assert.assertTrue(doc.isVertex()); } } finally { ODatabaseRecordThreadLocal.instance().set(database);