You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/02 07:11:12 UTC
[shardingsphere] branch master updated: Use gson JSONParser for asserting JSON equality deterministically (#22518) (#22526)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2bf753dfaf0 Use gson JSONParser for asserting JSON equality deterministically (#22518) (#22526)
2bf753dfaf0 is described below
commit 2bf753dfaf0ecda451e7a943897ebfa263427d6b
Author: Aditya Kumbhar <31...@users.noreply.github.com>
AuthorDate: Fri Dec 2 01:11:05 2022 -0600
Use gson JSONParser for asserting JSON equality deterministically (#22518) (#22526)
---
.../handler/distsql/ral/advance/ParseDistSQLHandlerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/advance/ParseDistSQLHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/advance/ParseDistSQLHandlerTest.java
index 7978c838b32..2fba1b2af9a 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/advance/ParseDistSQLHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/advance/ParseDistSQLHandlerTest.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.advance;
import com.google.gson.Gson;
+import com.google.gson.JsonParser;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
@@ -76,7 +77,7 @@ public final class ParseDistSQLHandlerTest extends ProxyContextRestorer {
parseDistSQLHandler.next();
SQLStatement statement = sqlParserRule.getSQLParserEngine("MySQL").parse(sql, false);
assertThat(new LinkedList<>(parseDistSQLHandler.getRowData().getData()).getFirst(), is("MySQLSelectStatement"));
- assertThat(new LinkedList<>(parseDistSQLHandler.getRowData().getData()).getLast(), is(new Gson().toJson(statement)));
+ assertThat(JsonParser.parseString(new LinkedList<>(parseDistSQLHandler.getRowData().getData()).getLast().toString()), is(JsonParser.parseString(new Gson().toJson(statement))));
}
@Test
@@ -89,8 +90,7 @@ public final class ParseDistSQLHandlerTest extends ProxyContextRestorer {
parseDistSQLHandler.execute();
parseDistSQLHandler.next();
SQLStatement statement = sqlParserRule.getSQLParserEngine("PostgreSQL").parse(sql, false);
- assertThat(new LinkedList<>(parseDistSQLHandler.getRowData().getData()).getFirst(), is("PostgreSQLSelectStatement"));
- assertThat(new LinkedList<>(parseDistSQLHandler.getRowData().getData()).getLast(), is(new Gson().toJson(statement)));
+ assertThat(JsonParser.parseString(new LinkedList<>(parseDistSQLHandler.getRowData().getData()).getLast().toString()), is(JsonParser.parseString(new Gson().toJson(statement))));
}
@Test(expected = SQLParsingException.class)