Repository: phoenix
Updated Branches:
  refs/heads/master ba7da1963 -> 14aa52c95


PHOENIX-1111 Fix flapping unit tests by removing inappropriate usage of 
TestUtil.TEST_PROPERTIES


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/14aa52c9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/14aa52c9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/14aa52c9

Branch: refs/heads/master
Commit: 14aa52c95ae92814680c94de697c2ecca339d442
Parents: ba7da19
Author: James Taylor <jamestay...@apache.org>
Authored: Fri Jul 25 13:21:00 2014 -0700
Committer: James Taylor <jamestay...@apache.org>
Committed: Fri Jul 25 13:23:15 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/phoenix/compile/WhereOptimizerTest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/14aa52c9/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java
index c5ec72f..4ee428c 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java
@@ -77,7 +77,7 @@ public class WhereOptimizerTest extends 
BaseConnectionlessQueryTest {
     }
 
     private static StatementContext compileStatement(String query, 
List<Object> binds, Integer limit) throws SQLException {
-        PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+        PhoenixConnection pconn = DriverManager.getConnection(getUrl(), new 
Properties(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
         PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
         TestUtil.bindParams(pstmt, binds);
         QueryPlan plan = pstmt.compileQuery();
@@ -1587,7 +1587,7 @@ public class WhereOptimizerTest extends 
BaseConnectionlessQueryTest {
         
         String tenantId = "tenantId";
         String tenantViewDDL = "CREATE VIEW TENANT_VIEW AS SELECT * FROM 
BASE_MULTI_TENANT_TABLE";
-        Properties tenantProps = TEST_PROPERTIES;
+        Properties tenantProps = new Properties();
         tenantProps.put(PhoenixRuntime.TENANT_ID_ATTRIB, tenantId);
         conn = DriverManager.getConnection(getUrl(), tenantProps);
         conn.createStatement().execute(tenantViewDDL);
@@ -1634,7 +1634,7 @@ public class WhereOptimizerTest extends 
BaseConnectionlessQueryTest {
     }
     
     private static Connection getTenantSpecificConnection(String tenantId) 
throws Exception {
-       Properties tenantProps = TEST_PROPERTIES;
+       Properties tenantProps = new Properties();
         tenantProps.put(PhoenixRuntime.TENANT_ID_ATTRIB, tenantId);
         Connection conn = DriverManager.getConnection(getUrl(), tenantProps);
         return conn;

Reply via email to