geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [50/50] [abbrv] incubator-geode git commit: Fix QueryUsingPoolDUnitTest by undoing admin pkg changes in strings
Date Mon, 07 Nov 2016 20:34:31 GMT
Fix QueryUsingPoolDUnitTest by undoing admin pkg changes in strings


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cba0bd53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cba0bd53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cba0bd53

Branch: refs/heads/feature/GEODE-288
Commit: cba0bd53cbe6299b7838e6f24fa4bf0145c90234
Parents: 6bb27bf
Author: Kirk Lund <klund@apache.org>
Authored: Mon Nov 7 12:31:24 2016 -0800
Committer: Kirk Lund <klund@apache.org>
Committed: Mon Nov 7 12:31:24 2016 -0800

----------------------------------------------------------------------
 .../query/dunit/QueryUsingPoolDUnitTest.java    | 31 ++++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cba0bd53/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index ade1450..91b8bec 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -122,7 +122,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
   }
 
   public void createPool(final String poolName, final String[] servers, final int[] ports,
-      final boolean subscriptionEnabled) {
+                         final boolean subscriptionEnabled) {
     // Create Cache.
     getCache(true);
 
@@ -198,7 +198,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
       }
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct * from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
* from "
               + regionName;
 
       try {
@@ -212,7 +212,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
       assertTrue(!results.getCollectionType().allowsDuplicates());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct * from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
* from "
               + regionName + " where ticker = 'ibm'";
       try {
         Query query = qService.newQuery(queryString);
@@ -224,7 +224,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
       assertTrue(!results.getCollectionType().allowsDuplicates());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct * from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
* from "
               + regionName + " where ticker = 'IBM'";
       try {
         Query query = qService.newQuery(queryString);
@@ -236,7 +236,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
       assertTrue(!results.getCollectionType().allowsDuplicates());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct * from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
* from "
               + regionName + " where price > 49";
       try {
         Query query = qService.newQuery(queryString);
@@ -248,7 +248,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
       assertTrue(!results.getCollectionType().allowsDuplicates());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct * from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
* from "
               + regionName + " where price = 50";
       try {
         Query query = qService.newQuery(queryString);
@@ -260,7 +260,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
       assertTrue(!results.getCollectionType().allowsDuplicates());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct * from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
* from "
               + regionName + " where ticker = 'ibm' and price = 50";
       try {
         Query query = qService.newQuery(queryString);
@@ -318,7 +318,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
       }
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct ticker, price from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
ticker, price from "
               + regionName;
       try {
         Query query = qService.newQuery(queryString);
@@ -331,7 +331,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
           && results.getCollectionType().getElementType().isStructType());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct ticker, price from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
ticker, price from "
               + regionName + " where ticker = 'ibm'";
       try {
         Query query = qService.newQuery(queryString);
@@ -344,7 +344,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
           && results.getCollectionType().getElementType().isStructType());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct ticker, price from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
ticker, price from "
               + regionName + " where ticker = 'IBM'";
       try {
         Query query = qService.newQuery(queryString);
@@ -357,7 +357,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
           && results.getCollectionType().getElementType().isStructType());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct ticker, price from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
ticker, price from "
               + regionName + " where price > 49";
       try {
         Query query = qService.newQuery(queryString);
@@ -370,7 +370,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
           && results.getCollectionType().getElementType().isStructType());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct ticker, price from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
ticker, price from "
               + regionName + " where price = 50";
       try {
         Query query = qService.newQuery(queryString);
@@ -383,7 +383,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
           && results.getCollectionType().getElementType().isStructType());
 
       queryString =
-          "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject; select
distinct ticker, price from "
+          "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject; select distinct
ticker, price from "
               + regionName + " where ticker = 'ibm' and price = 50";
       try {
         Query query = qService.newQuery(queryString);
@@ -685,7 +685,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
   }
 
   private void executeQueriesForClientServerQueriesWithParams(SelectResults results,
-      QueryService qService, Object[][] params, int[] expectedResults) {
+                                                              QueryService qService, Object[][]
params, int[] expectedResults) {
     for (int i = 0; i < queryString.length; i++) {
       try {
         logger.info("### Executing Query :" + queryString[i]);
@@ -1654,8 +1654,7 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
       }
 
       try {
-        String importString =
-            "import org.apache.geode.query.dunit.QueryUsingPoolDUnitTest.TestObject;";
+        String importString = "import org.apache.geode.admin.QueryUsingPoolDUnitTest.TestObject;";
         qService.createIndex("test", IndexType.FUNCTIONAL, "ticker", regionName1, importString);
       } catch (UnsupportedOperationException e) {
         // Expected behavior.


Mime
View raw message