This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-QueryProvider
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-QueryProvider by
this push:
new c19b76b refactor the test cases to different package
c19b76b is described below
commit c19b76bd4f9cc4bb840c8f8e181dc67aca5ff071
Author: Xiaojian Zhou <[email protected]>
AuthorDate: Mon Sep 3 15:53:43 2018 -0700
refactor the test cases to different package
Signed-off-by: Biju Kunjummen <[email protected]>
---
.../cache/lucene/test/SomeDomainTestObject.java | 141 ++++++++++++++
.../cache/lucene/LuceneNumericQueryDUnitTest.java | 209 ++++-----------------
.../lucene/LuceneNumericQueryIntegrationTest.java | 39 ++--
3 files changed, 199 insertions(+), 190 deletions(-)
diff --git
a/geode-lucene/geode-lucene-test/src/main/java/org/apache/geode/cache/lucene/test/SomeDomainTestObject.java
b/geode-lucene/geode-lucene-test/src/main/java/org/apache/geode/cache/lucene/test/SomeDomainTestObject.java
new file mode 100644
index 0000000..8ccbc6d
--- /dev/null
+++
b/geode-lucene/geode-lucene-test/src/main/java/org/apache/geode/cache/lucene/test/SomeDomainTestObject.java
@@ -0,0 +1,141 @@
+package org.apache.geode.cache.lucene.test;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+public class SomeDomainTestObject implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private final String strField;
+ private final int intField;
+ private final long longField;
+ private final float floatField;
+ private final double doubleField;
+ private final Date dateField;
+
+ public SomeDomainTestObject(String strField, int intField, long longField,
float floatField,
+ double doubleField, Date dateField) {
+ this.strField = strField;
+ this.intField = intField;
+ this.longField = longField;
+ this.floatField = floatField;
+ this.doubleField = doubleField;
+ this.dateField = dateField;
+ }
+
+ private SomeDomainTestObject(Builder builder) {
+ strField = builder.strField;
+ intField = builder.intField;
+ longField = builder.longField;
+ floatField = builder.floatField;
+ doubleField = builder.doubleField;
+ dateField = builder.dateField;
+ }
+
+ public String getStrField() {
+ return strField;
+ }
+
+ public int getIntField() {
+ return intField;
+ }
+
+ public long getLongField() {
+ return longField;
+ }
+
+ public float getFloatField() {
+ return floatField;
+ }
+
+ public Date getDateField() {
+ return dateField;
+ }
+
+ public double getDoubleField() {
+ return doubleField;
+ }
+
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ @Override
+ public String toString() {
+ final StringBuffer sb = new StringBuffer("SomeDomain{");
+ sb.append("strField='").append(strField).append('\'');
+ sb.append(", height=").append(intField);
+ sb.append(", dateField=").append(dateField);
+ sb.append('}');
+ return sb.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ SomeDomainTestObject that = (SomeDomainTestObject) o;
+ return intField == that.intField &&
+ longField == that.longField &&
+ Float.compare(that.floatField, floatField) == 0 &&
+ Double.compare(that.doubleField, doubleField) == 0 &&
+ Objects.equals(strField, that.strField) &&
+ Objects.equals(dateField, that.dateField);
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(strField, intField, longField, floatField,
doubleField, dateField);
+ }
+
+ public static final class Builder {
+ private String strField;
+ private int intField;
+ private long longField;
+ private float floatField;
+ private double doubleField;
+ private Date dateField;
+
+ private Builder() {}
+
+ public Builder withStrField(String val) {
+ strField = val;
+ return this;
+ }
+
+ public Builder withIntField(int val) {
+ intField = val;
+ return this;
+ }
+
+ public Builder withLongField(long val) {
+ longField = val;
+ return this;
+ }
+
+ public Builder withFloatField(float val) {
+ floatField = val;
+ return this;
+ }
+
+ public Builder withDoubleField(double val) {
+ doubleField = val;
+ return this;
+ }
+
+ public Builder withDateField(Date val) {
+ dateField = val;
+ return this;
+ }
+
+ public SomeDomainTestObject build() {
+ return new SomeDomainTestObject(this);
+ }
+ }
+}
diff --git
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneNumericQueryDUnitTest.java
b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneNumericQueryDUnitTest.java
similarity index 56%
rename from
geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneNumericQueryDUnitTest.java
rename to
geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneNumericQueryDUnitTest.java
index bc64fc2..59d105c 100644
---
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneNumericQueryDUnitTest.java
+++
b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneNumericQueryDUnitTest.java
@@ -18,11 +18,9 @@ package org.apache.geode.cache.lucene;
import static
org.apache.geode.distributed.ConfigurationProperties.SERIALIZABLE_OBJECT_FILTER;
import static org.assertj.core.api.Assertions.assertThat;
-import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.Date;
-import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@@ -35,6 +33,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.lucene.test.SomeDomainTestObject;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
@@ -42,9 +41,8 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.dunit.rules.ClientVM;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category(LuceneDUnitTest.class)
public class LuceneNumericQueryDUnitTest {
@ClassRule
@@ -54,8 +52,8 @@ public class LuceneNumericQueryDUnitTest {
private static MemberVM server1;
private static ClientVM client1;
- private static final SomeDomain someDomain1 =
- SomeDomain.newBuilder()
+ private static final SomeDomainTestObject someDomain1 =
+ SomeDomainTestObject.newBuilder()
.withStrField("strField1")
.withIntField(110)
.withLongField(10010L)
@@ -65,8 +63,8 @@ public class LuceneNumericQueryDUnitTest {
Date.from(LocalDateTime.parse("2001-01-01T00:00:00").toInstant(ZoneOffset.UTC)))
.build();
- private static final SomeDomain someDomain2 =
- SomeDomain.newBuilder()
+ private static final SomeDomainTestObject someDomain2 =
+ SomeDomainTestObject.newBuilder()
.withStrField("strField2")
.withIntField(120)
.withLongField(10020L)
@@ -76,8 +74,8 @@ public class LuceneNumericQueryDUnitTest {
Date.from(LocalDateTime.parse("2002-01-01T00:00:00").toInstant(ZoneOffset.UTC)))
.build();
- private static final SomeDomain someDomain3 =
- SomeDomain.newBuilder()
+ private static final SomeDomainTestObject someDomain3 =
+ SomeDomainTestObject.newBuilder()
.withStrField("strField3")
.withIntField(130)
.withLongField(10030L)
@@ -114,15 +112,16 @@ public class LuceneNumericQueryDUnitTest {
.create("idx1",
"/sampleregion");
- cache.<String, SomeDomain>createRegionFactory(RegionShortcut.PARTITION)
+ cache.<String,
SomeDomainTestObject>createRegionFactory(RegionShortcut.PARTITION)
.create("sampleregion");
});
client1.invoke(() -> {
ClientCache clientCache = ClusterStartupRule.getClientCache();
- Region<String, SomeDomain> region =
- clientCache.<String,
SomeDomain>createClientRegionFactory(ClientRegionShortcut.PROXY)
+ Region<String, SomeDomainTestObject> region =
+ clientCache
+ .<String,
SomeDomainTestObject>createClientRegionFactory(ClientRegionShortcut.PROXY)
.create("sampleregion");
region.put(someDomain1.getStrField(), someDomain1);
region.put(someDomain2.getStrField(), someDomain2);
@@ -146,25 +145,27 @@ public class LuceneNumericQueryDUnitTest {
LuceneService luceneService = LuceneServiceProvider.get(clientCache);
- LuceneQuery<String, SomeDomain> luceneQuery1 =
luceneService.createLuceneQueryFactory()
- .create("idx1", "/sampleregion", "+strField=strField* +intField:[110
TO 120]",
- "strField");
+ LuceneQuery<String, SomeDomainTestObject> luceneQuery1 =
+ luceneService.createLuceneQueryFactory()
+ .create("idx1", "/sampleregion", "+strField=strField*
+intField:[110 TO 120]",
+ "strField");
assertThat(luceneQuery1.findKeys())
.containsExactlyInAnyOrder("strField1", "strField2");
- assertThat(luceneQuery1.<SomeDomain>findValues())
+ assertThat(luceneQuery1.<SomeDomainTestObject>findValues())
.containsExactlyInAnyOrder(someDomain1, someDomain2);
- LuceneQuery<String, SomeDomain> luceneQuery2 =
luceneService.createLuceneQueryFactory()
- .create("idx1", "/sampleregion", "+strField=strField* +intField:[120
TO 130]",
- "strField");
+ LuceneQuery<String, SomeDomainTestObject> luceneQuery2 =
+ luceneService.createLuceneQueryFactory()
+ .create("idx1", "/sampleregion", "+strField=strField*
+intField:[120 TO 130]",
+ "strField");
assertThat(luceneQuery2.findKeys())
.containsExactlyInAnyOrder("strField2", "strField3");
- assertThat(luceneQuery2.<SomeDomain>findValues())
+ assertThat(luceneQuery2.<SomeDomainTestObject>findValues())
.containsExactlyInAnyOrder(someDomain2, someDomain3);
});
@@ -177,22 +178,24 @@ public class LuceneNumericQueryDUnitTest {
LuceneService luceneService = LuceneServiceProvider.get(clientCache);
- LuceneQuery<String, SomeDomain> luceneQuery1 =
luceneService.createLuceneQueryFactory()
- .create("idx1", "/sampleregion", "+longField:[10010 TO 10025]",
"strField");
+ LuceneQuery<String, SomeDomainTestObject> luceneQuery1 =
+ luceneService.createLuceneQueryFactory()
+ .create("idx1", "/sampleregion", "+longField:[10010 TO 10025]",
"strField");
assertThat(luceneQuery1.findKeys())
.containsExactlyInAnyOrder("strField1", "strField2");
- assertThat(luceneQuery1.<SomeDomain>findValues())
+ assertThat(luceneQuery1.<SomeDomainTestObject>findValues())
.containsExactlyInAnyOrder(someDomain1, someDomain2);
- LuceneQuery<String, SomeDomain> luceneQuery2 =
luceneService.createLuceneQueryFactory()
- .create("idx1", "/sampleregion", "+longField:[10011 TO 10030]",
"strField");
+ LuceneQuery<String, SomeDomainTestObject> luceneQuery2 =
+ luceneService.createLuceneQueryFactory()
+ .create("idx1", "/sampleregion", "+longField:[10011 TO 10030]",
"strField");
assertThat(luceneQuery2.findKeys())
.containsExactlyInAnyOrder("strField2", "strField3");
- assertThat(luceneQuery2.<SomeDomain>findValues())
+ assertThat(luceneQuery2.<SomeDomainTestObject>findValues())
.containsExactlyInAnyOrder(someDomain2, someDomain3);
});
}
@@ -204,13 +207,14 @@ public class LuceneNumericQueryDUnitTest {
LuceneService luceneService = LuceneServiceProvider.get(clientCache);
- LuceneQuery<String, SomeDomain> luceneQuery1 =
luceneService.createLuceneQueryFactory()
- .create("idx1", "/sampleregion", "+floatField:[100 TO 202]",
"strField");
+ LuceneQuery<String, SomeDomainTestObject> luceneQuery1 =
+ luceneService.createLuceneQueryFactory()
+ .create("idx1", "/sampleregion", "+floatField:[100 TO 202]",
"strField");
assertThat(luceneQuery1.findKeys())
.containsExactlyInAnyOrder("strField1", "strField2");
- assertThat(luceneQuery1.<SomeDomain>findValues())
+ assertThat(luceneQuery1.<SomeDomainTestObject>findValues())
.containsExactlyInAnyOrder(someDomain1, someDomain2);
});
}
@@ -222,152 +226,15 @@ public class LuceneNumericQueryDUnitTest {
LuceneService luceneService = LuceneServiceProvider.get(clientCache);
- LuceneQuery<String, SomeDomain> luceneQuery1 =
luceneService.createLuceneQueryFactory()
- .create("idx1", "/sampleregion", "+doubleField:[100 TO 202]",
"strField");
+ LuceneQuery<String, SomeDomainTestObject> luceneQuery1 =
+ luceneService.createLuceneQueryFactory()
+ .create("idx1", "/sampleregion", "+doubleField:[100 TO 202]",
"strField");
assertThat(luceneQuery1.findKeys())
.containsExactlyInAnyOrder("strField1", "strField2");
- assertThat(luceneQuery1.<SomeDomain>findValues())
+ assertThat(luceneQuery1.<SomeDomainTestObject>findValues())
.containsExactlyInAnyOrder(someDomain1, someDomain2);
});
}
}
-
-
-class SomeDomain implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final String strField;
- private final int intField;
- private final long longField;
- private final float floatField;
- private final double doubleField;
- private final Date dateField;
-
- public SomeDomain(String strField, int intField, long longField, float
floatField,
- double doubleField, Date dateField) {
- this.strField = strField;
- this.intField = intField;
- this.longField = longField;
- this.floatField = floatField;
- this.doubleField = doubleField;
- this.dateField = dateField;
- }
-
- private SomeDomain(Builder builder) {
- strField = builder.strField;
- intField = builder.intField;
- longField = builder.longField;
- floatField = builder.floatField;
- doubleField = builder.doubleField;
- dateField = builder.dateField;
- }
-
- public String getStrField() {
- return strField;
- }
-
- public int getIntField() {
- return intField;
- }
-
- public long getLongField() {
- return longField;
- }
-
- public float getFloatField() {
- return floatField;
- }
-
- public Date getDateField() {
- return dateField;
- }
-
- public double getDoubleField() {
- return doubleField;
- }
-
- public static Builder newBuilder() {
- return new Builder();
- }
-
- @Override
- public String toString() {
- final StringBuffer sb = new StringBuffer("SomeDomain{");
- sb.append("strField='").append(strField).append('\'');
- sb.append(", height=").append(intField);
- sb.append(", dateField=").append(dateField);
- sb.append('}');
- return sb.toString();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- SomeDomain that = (SomeDomain) o;
- return intField == that.intField &&
- longField == that.longField &&
- Float.compare(that.floatField, floatField) == 0 &&
- Double.compare(that.doubleField, doubleField) == 0 &&
- Objects.equals(strField, that.strField) &&
- Objects.equals(dateField, that.dateField);
- }
-
- @Override
- public int hashCode() {
-
- return Objects.hash(strField, intField, longField, floatField,
doubleField, dateField);
- }
-
- public static final class Builder {
- private String strField;
- private int intField;
- private long longField;
- private float floatField;
- private double doubleField;
- private Date dateField;
-
- private Builder() {}
-
- public Builder withStrField(String val) {
- strField = val;
- return this;
- }
-
- public Builder withIntField(int val) {
- intField = val;
- return this;
- }
-
- public Builder withLongField(long val) {
- longField = val;
- return this;
- }
-
- public Builder withFloatField(float val) {
- floatField = val;
- return this;
- }
-
- public Builder withDoubleField(double val) {
- doubleField = val;
- return this;
- }
-
- public Builder withDateField(Date val) {
- dateField = val;
- return this;
- }
-
- public SomeDomain build() {
- return new SomeDomain(this);
- }
- }
-}
diff --git
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneNumericQueryIntegrationTest.java
b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneNumericQueryIntegrationTest.java
similarity index 77%
rename from
geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneNumericQueryIntegrationTest.java
rename to
geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneNumericQueryIntegrationTest.java
index f841e6d..915047a 100644
---
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneNumericQueryIntegrationTest.java
+++
b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneNumericQueryIntegrationTest.java
@@ -29,19 +29,18 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.lucene.test.SomeDomainTestObject;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(DistributedTest.class)
+@Category(LuceneIntegrationTest.class)
public class LuceneNumericQueryIntegrationTest {
@Rule
public ServerStarterRule serverStarterRule = new ServerStarterRule()
- .withPDXPersistent()
.withPDXReadSerialized()
.withProperty(SERIALIZABLE_OBJECT_FILTER,
"org.apache.geode.cache.lucene.*")
.withAutoStart();
@@ -50,8 +49,8 @@ public class LuceneNumericQueryIntegrationTest {
- private static final SomeDomain someDomain1 =
- SomeDomain.newBuilder()
+ private static final SomeDomainTestObject someDomain1 =
+ SomeDomainTestObject.newBuilder()
.withStrField("strField1")
.withIntField(110)
.withLongField(10010L)
@@ -61,8 +60,8 @@ public class LuceneNumericQueryIntegrationTest {
Date.from(LocalDateTime.parse("2001-01-01T00:00:00").toInstant(ZoneOffset.UTC)))
.build();
- private static final SomeDomain someDomain2 =
- SomeDomain.newBuilder()
+ private static final SomeDomainTestObject someDomain2 =
+ SomeDomainTestObject.newBuilder()
.withStrField("strField2")
.withIntField(120)
.withLongField(10020L)
@@ -72,8 +71,8 @@ public class LuceneNumericQueryIntegrationTest {
Date.from(LocalDateTime.parse("2002-01-01T00:00:00").toInstant(ZoneOffset.UTC)))
.build();
- private static final SomeDomain someDomain3 =
- SomeDomain.newBuilder()
+ private static final SomeDomainTestObject someDomain3 =
+ SomeDomainTestObject.newBuilder()
.withStrField("strField3")
.withIntField(130)
.withLongField(10030L)
@@ -93,10 +92,10 @@ public class LuceneNumericQueryIntegrationTest {
.create("idx1",
"/sampleregion");
- this.cache.<String,
SomeDomain>createRegionFactory(RegionShortcut.PARTITION)
+ this.cache.<String,
SomeDomainTestObject>createRegionFactory(RegionShortcut.PARTITION)
.create("sampleregion");
- Region<String, SomeDomain> region = this.cache.getRegion("/sampleregion");
+ Region<String, SomeDomainTestObject> region =
this.cache.getRegion("/sampleregion");
region.put(someDomain1.getStrField(), someDomain1);
region.put(someDomain2.getStrField(), someDomain2);
@@ -115,25 +114,27 @@ public class LuceneNumericQueryIntegrationTest {
LuceneService luceneService = LuceneServiceProvider.get(cache);
- LuceneQuery<String, SomeDomain> luceneQuery1 =
luceneService.createLuceneQueryFactory()
- .create("idx1", "/sampleregion", "+strField=strField* +intField:[110
TO 120]",
- "strField");
+ LuceneQuery<String, SomeDomainTestObject> luceneQuery1 =
+ luceneService.createLuceneQueryFactory()
+ .create("idx1", "/sampleregion", "+strField=strField*
+intField:[110 TO 120]",
+ "strField");
assertThat(luceneQuery1.findKeys())
.containsExactlyInAnyOrder("strField1", "strField2");
- assertThat(luceneQuery1.<SomeDomain>findValues())
+ assertThat(luceneQuery1.<SomeDomainTestObject>findValues())
.containsExactlyInAnyOrder(someDomain1, someDomain2);
- LuceneQuery<String, SomeDomain> luceneQuery2 =
luceneService.createLuceneQueryFactory()
- .create("idx1", "/sampleregion", "+strField=strField* +intField:[120
TO 130]",
- "strField");
+ LuceneQuery<String, SomeDomainTestObject> luceneQuery2 =
+ luceneService.createLuceneQueryFactory()
+ .create("idx1", "/sampleregion", "+strField=strField*
+intField:[120 TO 130]",
+ "strField");
assertThat(luceneQuery2.findKeys())
.containsExactlyInAnyOrder("strField2", "strField3");
- assertThat(luceneQuery2.<SomeDomain>findValues())
+ assertThat(luceneQuery2.<SomeDomainTestObject>findValues())
.containsExactlyInAnyOrder(someDomain2, someDomain3);
}
