You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/07/01 10:41:06 UTC
[16/20] ignite git commit: Fixed failing test.
Fixed failing test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7086cc02
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7086cc02
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7086cc02
Branch: refs/heads/ignite-3410
Commit: 7086cc0258106120f4a476c9b783b40904675d04
Parents: 6fd69af
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jun 30 09:24:46 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jun 30 09:24:46 2016 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/GridQueryParsingTest.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7086cc02/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index ce1f241..9fb5765 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -292,7 +292,10 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
* @param sql2 Sql 2.
*/
private void assertSqlEquals(String sql1, String sql2) {
- assertEquals(normalizeSql(sql1), normalizeSql(sql2));
+ String nsql1 = normalizeSql(sql1);
+ String nsql2 = normalizeSql(sql2);
+
+ assertEquals(nsql1, nsql2);
}
/**
@@ -301,7 +304,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
private static String normalizeSql(String sql) {
return sql.toLowerCase()
.replaceAll("/\\*(?:.|\r|\n)*?\\*/", " ")
- .replaceAll("\\s*on\\s+1\\s*=\\s*1\\s*", " ")
+ .replaceAll("\\s*on\\s+1\\s*=\\s*1\\s*", " on true ")
.replaceAll("\\s+", " ")
.replaceAll("\\( +", "(")
.replaceAll(" +\\)", ")")
@@ -314,9 +317,9 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
private void checkQuery(String qry) throws Exception {
Prepared prepared = parse(qry);
- GridSqlQueryParser ses = new GridSqlQueryParser();
+ GridSqlQuery gQry = new GridSqlQueryParser().parse(prepared);
- String res = ses.parse(prepared).getSQL();
+ String res = gQry.getSQL();
System.out.println(normalizeSql(res));