From 84be709c4a83b158eadc465f9ea385a21dc3f288 Mon Sep 17 00:00:00 2001 From: Subhashni Balakrishnan Date: Wed, 12 Apr 2017 15:38:19 -0700 Subject: [PATCH] DATACOUCH-294 Fix failing tests due to upgrade ViewQuery toString has changed with the recent sdk upgrade, so the tests using string compare were failing. Also, part tree n1ql tests were failing due to a recent change to add parentheses for where clause. --- .../couchbase/repository/RepositoryIndexUsageTest.java | 8 ++++---- .../repository/query/PartTreeN1qBasedQueryTest.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java b/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java index 7b32860e..701a6348 100644 --- a/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java +++ b/src/test/java/org/springframework/data/couchbase/repository/RepositoryIndexUsageTest.java @@ -75,7 +75,7 @@ public class RepositoryIndexUsageTest { @Test public void testFindAllUsesViewWithConfiguredConsistency() { - String expectedQueryParams = "reduce=false&stale=false"; + String expectedQueryParams = "ViewQuery(string/all){params=\"reduce=false&stale=false\"}"; repository.findAll(); verify(couchbaseOperations, never()).queryView(any(ViewQuery.class)); @@ -89,7 +89,7 @@ public class RepositoryIndexUsageTest { @Test public void testFindAllKeysUsesViewWithConfiguredConsistency() { - String expectedQueryParams = "reduce=false&stale=false"; + String expectedQueryParams = "ViewQuery(string/all){params=\"reduce=false&stale=false\", keys=\"[\"someKey\"]\"}"; repository.findAll(Collections.singleton("someKey")); verify(couchbaseOperations, never()).queryView(any(ViewQuery.class)); @@ -103,7 +103,7 @@ public class RepositoryIndexUsageTest { @Test public void testCountUsesViewWithConfiguredConsistencyAndReduces() { - String expectedQueryParams = "reduce=true&stale=false"; + String expectedQueryParams = "ViewQuery(string/all){params=\"reduce=true&stale=false\"}"; repository.count(); verify(couchbaseOperations, never()).findByView(any(ViewQuery.class), any(Class.class)); @@ -123,7 +123,7 @@ public class RepositoryIndexUsageTest { @Test public void testDeleteAllUsesViewWithConfiguredConsistency() { - String expectedQueryParams = "reduce=false&stale=false"; + String expectedQueryParams = "ViewQuery(string/all){params=\"reduce=false&stale=false\"}"; repository.deleteAll(); verify(couchbaseOperations, never()).findByView(any(ViewQuery.class), any(Class.class)); diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java b/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java index 82931dd6..2c8788ad 100644 --- a/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java +++ b/src/test/java/org/springframework/data/couchbase/repository/query/PartTreeN1qBasedQueryTest.java @@ -76,7 +76,7 @@ public class PartTreeN1qBasedQueryTest { PartTreeN1qlBasedQuery query = new PartTreeN1qlBasedQuery(queryMethod, couchbaseOperations); Statement statement = query.getCount(accessor, new Object[] { "value", pr }); - assertEquals("SELECT COUNT(*) AS count FROM `default` WHERE name = \"value\" " + assertEquals("SELECT COUNT(*) AS count FROM `default` WHERE (name = \"value\") " + "AND `_class` = \"org.springframework.data.couchbase.core.Beer\"", statement.toString()); } @@ -119,7 +119,7 @@ public class PartTreeN1qBasedQueryTest { PartTreeN1qlBasedQuery query = new PartTreeN1qlBasedQuery(queryMethod, couchbaseOperations); Statement statement = query.getCount(accessor, new Object[] { "value", pr }); - assertEquals("SELECT COUNT(*) AS count FROM `default` WHERE name = \"value\" " + assertEquals("SELECT COUNT(*) AS count FROM `default` WHERE (name = \"value\") " + "AND `_class` = \"org.springframework.data.couchbase.core.Beer\"", statement.toString()); }