This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
The following commit(s) were added to refs/heads/master by this push:
new e5dd8876 Update ExpandSelectTreeCreatorImplTest.java
e5dd8876 is described below
commit e5dd8876a3f7e1bd2cb355c4181fffa921cd0fa9
Author: BoyuLi4 <[email protected]>
AuthorDate: Thu Dec 1 00:03:49 2022 -0600
Update ExpandSelectTreeCreatorImplTest.java
---
.../core/uri/ExpandSelectTreeCreatorImplTest.java | 41 ++++++++++++----------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
index 0e6c50e2..6de1f56f 100644
---
a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
+++
b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
@@ -41,11 +41,14 @@ import org.apache.olingo.odata2.testutil.mock.MockFacade;
import org.junit.BeforeClass;
import org.junit.Test;
+import com.google.gson.JsonParser;
+
/**
*
*/
public class ExpandSelectTreeCreatorImplTest extends BaseTest {
private static Edm edm;
+ private static JsonParser parser = new JsonParser();
@BeforeClass
public static void setEdm() throws ODataException {
@@ -178,12 +181,12 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
@Test
public void thirdLevel() throws Exception {
- assertEquals("{\"all\":false,\"properties\":[],\"links\":["
+ assertEquals(parser.parse("{\"all\":false,\"properties\":[],\"links\":["
+ "{\"ne_Team\":{\"all\":false,\"properties\":[],\"links\":["
+ "{\"nt_Employees\":{\"all\":false,\"properties\":[],\"links\":["
- +
"{\"ne_Manager\":{\"all\":false,\"properties\":[\"EmployeeId\"],\"links\":[]}}]}}]}}]}",
- getExpandSelectTree("ne_Team/nt_Employees/ne_Manager/EmployeeId",
"ne_Team/nt_Employees/ne_Manager")
- .toJsonString());
+ +
"{\"ne_Manager\":{\"all\":false,\"properties\":[\"EmployeeId\"],\"links\":[]}}]}}]}}]}"),
+
parser.parse(getExpandSelectTree("ne_Team/nt_Employees/ne_Manager/EmployeeId",
"ne_Team/nt_Employees/ne_Manager")
+ .toJsonString()));
}
@Test
@@ -227,7 +230,7 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
"{\"all\":true,\"properties\":[],\"links\":[{\"ne_Team\":{\"all\":true,\"properties\":[],"
+
"\"links\":[{\"nt_Employees\":{\"all\":true,\"properties\":[],\"links\":[]}}]}}]}";
String actualString = managerNode.toJsonString();
- assertEquals(expected, actualString);
+ assertEquals(parser.parse(expected), parser.parse(actualString));
} else {
fail("Unknown navigation property in links: " + navPropertyName);
}
@@ -324,7 +327,7 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
// $expand=ne_Manager/ne_Manager,ne_Manager
String actual = getExpandSelectTree(null,
"ne_Manager/ne_Manager,ne_Manager").toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
}
@Test
@@ -352,19 +355,19 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
// $select=ne_Manager $expand=ne_Manager/ne_Room/nr_Building
String actual = getExpandSelectTree("ne_Manager",
"ne_Manager/ne_Room/nr_Building").toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
// $select=ne_Manager,ne_Manager/EmployeeId
$expand=ne_Manager/ne_Room/nr_Building
actual = getExpandSelectTree("ne_Manager,ne_Manager/EmployeeId",
"ne_Manager/ne_Room/nr_Building").toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
// $select=ne_Manager/EmployeeId,ne_Manager
$expand=ne_Manager/ne_Room/nr_Building
actual = getExpandSelectTree("ne_Manager/EmployeeId,ne_Manager",
"ne_Manager/ne_Room/nr_Building").toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
// $select=ne_Manager,ne_Manager $expand=ne_Manager/ne_Room/nr_Building
actual = getExpandSelectTree("ne_Manager,ne_Manager",
"ne_Manager/ne_Room/nr_Building").toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
}
@Test
@@ -377,11 +380,11 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
// $select=EmployeeId,ne_Room/* $expand=ne_Room/nr_Building
String actual = getExpandSelectTree("EmployeeId,ne_Room/*",
"ne_Room/nr_Building").toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
// $select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
actual = getExpandSelectTree("EmployeeId,ne_Room/*",
"ne_Room/nr_Building/nb_Rooms").toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
}
@Test
@@ -432,13 +435,13 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
String actual =
getExpandSelectTree("ne_Manager/ne_Room,ne_Manager/EmployeeId",
"ne_Manager/ne_Room/nr_Building")
.toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
// $select=EmployeeId,ne_Room/Id $expand=ne_Room/nr_Building/nb_Rooms
actual =
getExpandSelectTree("ne_Manager/EmployeeId,ne_Manager/ne_Room",
"ne_Manager/ne_Room/nr_Building")
.toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
}
@Test
@@ -459,13 +462,13 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
// $select=ne_Manager
$expand=ne_Manager/ne_Room/nr_Building,ne_Manager/ne_Team
String actual =
getExpandSelectTree("ne_Manager",
"ne_Manager/ne_Room/nr_Building,ne_Manager/ne_Team").toJsonString();
- if (!expected1.equals(actual) && !expected2.equals(actual)) {
+ if (!parser.parse(expected1).equals(parser.parse(actual)) &&
!parser.parse(expected2).equals(parser.parse(actual))) {
fail("Either " + expected1 + " or " + expected2 + " expected but was: "
+ actual);
}
// $select=ne_Manager
$expand=ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building
actual = getExpandSelectTree("ne_Manager",
"ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building").toJsonString();
- if (!expected1.equals(actual) && !expected2.equals(actual)) {
+ if (!parser.parse(expected1).equals(parser.parse(actual)) &&
!parser.parse(expected2).equals(parser.parse(actual))) {
fail("Either " + expected1 + " or " + expected2 + " expected but was: "
+ actual);
}
@@ -473,7 +476,7 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
actual =
getExpandSelectTree("ne_Manager,ne_Manager/ne_Team/Id",
"ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building")
.toJsonString();
- if (!expected1.equals(actual) && !expected2.equals(actual)) {
+ if (!parser.parse(expected1).equals(parser.parse(actual)) &&
!parser.parse(expected2).equals(parser.parse(actual))) {
fail("Either " + expected1 + " or " + expected2 + " expected but was: "
+ actual);
}
@@ -481,7 +484,7 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
actual =
getExpandSelectTree("ne_Manager/ne_Team/Id,ne_Manager",
"ne_Manager/ne_Team,ne_Manager/ne_Room/nr_Building")
.toJsonString();
- if (!expected1.equals(actual) && !expected2.equals(actual)) {
+ if (!parser.parse(expected1).equals(parser.parse(actual)) &&
!parser.parse(expected2).equals(parser.parse(actual))) {
fail("Either " + expected1 + " or " + expected2 + " expected but was: "
+ actual);
}
}
@@ -501,7 +504,7 @@ public class ExpandSelectTreeCreatorImplTest extends
BaseTest {
String actual =
getExpandSelectTree("ne_Manager/EmployeeId,ne_Manager/ne_Room/Id,ne_Manager/ne_Room/nr_Building/Id,ne_Manager",
"ne_Manager/ne_Room/nr_Building").toJsonString();
- assertEquals(expected, actual);
+ assertEquals(parser.parse(expected), parser.parse(actual));
}
private ExpandSelectTreeNodeImpl getExpandSelectTree(final String
selectString, final String expandString)
