This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 5513bad079f Remove duplicate code analytics tests (#1490)
5513bad079f is described below
commit 5513bad079fd60233ec3c996051e84611b8b7bb0
Author: Jan Høydahl <[email protected]>
AuthorDate: Tue Apr 25 10:40:33 2023 +0200
Remove duplicate code analytics tests (#1490)
---
.../org/apache/solr/analytics/NoFacetTest.java | 80 +--------------------
.../solr/analytics/OverallAnalyticsTest.java | 82 +--------------------
.../solr/analytics/SolrAnalyticsTestCase.java | 81 +++++++++++++++++++++
.../solr/analytics/facet/PivotFacetTest.java | 83 +---------------------
.../solr/analytics/facet/QueryFacetTest.java | 83 +---------------------
.../solr/analytics/facet/RangeFacetTest.java | 83 +---------------------
.../solr/analytics/facet/ValueFacetTest.java | 83 +---------------------
7 files changed, 96 insertions(+), 479 deletions(-)
diff --git
a/solr/modules/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java
b/solr/modules/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java
index c67cfc800bd..27e5bb08a5d 100644
--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java
+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java
@@ -16,9 +16,7 @@
*/
package org.apache.solr.analytics;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -27,85 +25,9 @@ public class NoFacetTest extends SolrAnalyticsTestCase {
@BeforeClass
public static void populate() throws Exception {
- for (int j = 0; j < NUM_LOOPS; ++j) {
- int i = j % INT;
- long l = j % LONG;
- float f = j % FLOAT;
- double d = j % DOUBLE;
- String dt = (1800 + j % DATE) + "-12-31T23:59:59Z";
- String dtm = (1800 + j % DATE + 10) + "-12-31T23:59:59Z";
- String s = "str" + (j % STRING);
- List<String> fields = new ArrayList<>();
- fields.add("id");
- fields.add("1000" + j);
-
- if (i != 0) {
- fields.add("int_i");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + (i + 10));
- }
-
- if (l != 0l) {
- fields.add("long_l");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + (l + 10));
- }
-
- if (f != 0.0f) {
- fields.add("float_f");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + (f + 10));
- }
-
- if (d != 0.0d) {
- fields.add("double_d");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + (d + 10));
- }
-
- if ((j % DATE) != 0) {
- fields.add("date_dt");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dtm);
- }
-
- if ((j % STRING) != 0) {
- fields.add("string_s");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s + "_second");
- }
-
- addDoc(fields);
- }
- commitDocs();
+ SolrAnalyticsTestCase.populateDocsForAnalyticsTests();
}
- public static final int INT = 7;
- public static final int LONG = 2;
- public static final int FLOAT = 6;
- public static final int DOUBLE = 5;
- public static final int DATE = 3;
- public static final int STRING = 4;
- public static final int NUM_LOOPS = 20;
-
@Test
public void countTest() throws Exception {
Map<String, ETP> expressions = new HashMap<>();
diff --git
a/solr/modules/analytics/src/test/org/apache/solr/analytics/OverallAnalyticsTest.java
b/solr/modules/analytics/src/test/org/apache/solr/analytics/OverallAnalyticsTest.java
index b083ad94c2a..a118b80a2df 100644
---
a/solr/modules/analytics/src/test/org/apache/solr/analytics/OverallAnalyticsTest.java
+++
b/solr/modules/analytics/src/test/org/apache/solr/analytics/OverallAnalyticsTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.solr.analytics;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.solr.analytics.facet.SolrAnalyticsFacetTestCase;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -25,86 +23,10 @@ import org.junit.Test;
public class OverallAnalyticsTest extends SolrAnalyticsFacetTestCase {
@BeforeClass
- public static void populate() throws Exception {
- for (int j = 0; j < NUM_LOOPS; ++j) {
- int i = j % INT;
- long l = j % LONG;
- float f = j % FLOAT;
- double d = j % DOUBLE;
- String dt = (1800 + j % DATE) + "-12-31T23:59:59Z";
- String dtm = (1800 + j % DATE + 10) + "-12-31T23:59:59Z";
- String s = "str" + (j % STRING);
- List<String> fields = new ArrayList<>();
- fields.add("id");
- fields.add("1000" + j);
-
- if (i != 0) {
- fields.add("int_i");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + (i + 10));
- }
-
- if (l != 0l) {
- fields.add("long_l");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + (l + 10));
- }
-
- if (f != 0.0f) {
- fields.add("float_f");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + (f + 10));
- }
-
- if (d != 0.0d) {
- fields.add("double_d");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + (d + 10));
- }
-
- if ((j % DATE) != 0) {
- fields.add("date_dt");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dtm);
- }
-
- if ((j % STRING) != 0) {
- fields.add("string_s");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s + "_second");
- }
-
- addDoc(fields);
- }
- commitDocs();
+ public static void populate() {
+ SolrAnalyticsTestCase.populateDocsForAnalyticsTests();
}
- public static final int INT = 7;
- public static final int LONG = 2;
- public static final int FLOAT = 6;
- public static final int DOUBLE = 5;
- public static final int DATE = 3;
- public static final int STRING = 4;
- public static final int NUM_LOOPS = 20;
-
@Test
public void pivotFacetTest() throws Exception {
String analyticsRequest =
diff --git
a/solr/modules/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.java
b/solr/modules/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.java
index ed5984af776..9fae8c2c17f 100644
---
a/solr/modules/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.java
+++
b/solr/modules/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.java
@@ -18,6 +18,7 @@ package org.apache.solr.analytics;
import java.io.IOException;
import java.time.Instant;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
@@ -86,6 +87,86 @@ public class SolrAnalyticsTestCase extends SolrCloudTestCase
{
cloudReq = new UpdateRequest();
}
+ public static final int INT = 7;
+ public static final int LONG = 2;
+ public static final int FLOAT = 6;
+ public static final int DOUBLE = 5;
+ public static final int DATE = 3;
+ public static final int STRING = 4;
+ public static final int NUM_LOOPS = 20;
+
+ protected static void populateDocsForAnalyticsTests() {
+ for (int j = 0; j < NUM_LOOPS; ++j) {
+ int i = j % INT;
+ long l = j % LONG;
+ float f = j % FLOAT;
+ double d = j % DOUBLE;
+ String dt = (1800 + j % DATE) + "-12-31T23:59:59Z";
+ String dtm = (1800 + j % DATE + 10) + "-12-31T23:59:59Z";
+ String s = "str" + (j % STRING);
+ List<String> fields = new ArrayList<>();
+ fields.add("id");
+ fields.add("1000" + j);
+
+ if (i != 0) {
+ fields.add("int_i");
+ fields.add("" + i);
+ fields.add("int_im");
+ fields.add("" + i);
+ fields.add("int_im");
+ fields.add("" + (i + 10));
+ }
+
+ if (l != 0l) {
+ fields.add("long_l");
+ fields.add("" + l);
+ fields.add("long_lm");
+ fields.add("" + l);
+ fields.add("long_lm");
+ fields.add("" + (l + 10));
+ }
+
+ if (f != 0.0f) {
+ fields.add("float_f");
+ fields.add("" + f);
+ fields.add("float_fm");
+ fields.add("" + f);
+ fields.add("float_fm");
+ fields.add("" + (f + 10));
+ }
+
+ if (d != 0.0d) {
+ fields.add("double_d");
+ fields.add("" + d);
+ fields.add("double_dm");
+ fields.add("" + d);
+ fields.add("double_dm");
+ fields.add("" + (d + 10));
+ }
+
+ if ((j % DATE) != 0) {
+ fields.add("date_dt");
+ fields.add(dt);
+ fields.add("date_dtm");
+ fields.add(dt);
+ fields.add("date_dtm");
+ fields.add(dtm);
+ }
+
+ if ((j % STRING) != 0) {
+ fields.add("string_s");
+ fields.add(s);
+ fields.add("string_sm");
+ fields.add(s);
+ fields.add("string_sm");
+ fields.add(s + "_second");
+ }
+
+ addDoc(fields);
+ }
+ commitDocs();
+ }
+
private void testResults(SolrParams params, String analyticsRequest,
String... tests) {
String coreJson = queryCoreJson(params);
Object cloudObj = queryCloudObject(params);
diff --git
a/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/PivotFacetTest.java
b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/PivotFacetTest.java
index ebc095f13dc..8de7a51befa 100644
---
a/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/PivotFacetTest.java
+++
b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/PivotFacetTest.java
@@ -17,8 +17,7 @@
package org.apache.solr.analytics.facet;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.solr.analytics.SolrAnalyticsTestCase;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -26,86 +25,10 @@ import org.junit.Test;
public class PivotFacetTest extends SolrAnalyticsFacetTestCase {
@BeforeClass
- public static void populate() throws Exception {
- for (int j = 0; j < NUM_LOOPS; ++j) {
- int i = j % INT;
- long l = j % LONG;
- float f = j % FLOAT;
- double d = j % DOUBLE;
- String dt = (1800 + j % DATE) + "-12-31T23:59:59Z";
- String dtm = (1800 + j % DATE + 10) + "-12-31T23:59:59Z";
- String s = "str" + (j % STRING);
- List<String> fields = new ArrayList<>();
- fields.add("id");
- fields.add("1000" + j);
-
- if (i != 0) {
- fields.add("int_i");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + (i + 10));
- }
-
- if (l != 0l) {
- fields.add("long_l");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + (l + 10));
- }
-
- if (f != 0.0f) {
- fields.add("float_f");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + (f + 10));
- }
-
- if (d != 0.0d) {
- fields.add("double_d");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + (d + 10));
- }
-
- if ((j % DATE) != 0) {
- fields.add("date_dt");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dtm);
- }
-
- if ((j % STRING) != 0) {
- fields.add("string_s");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s + "_second");
- }
-
- addDoc(fields);
- }
- commitDocs();
+ public static void populate() {
+ SolrAnalyticsTestCase.populateDocsForAnalyticsTests();
}
- public static final int INT = 7;
- public static final int LONG = 2;
- public static final int FLOAT = 6;
- public static final int DOUBLE = 5;
- public static final int DATE = 3;
- public static final int STRING = 4;
- public static final int NUM_LOOPS = 20;
-
@Test
public void pivotFacetTest() throws Exception {
String analyticsRequest =
diff --git
a/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java
b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java
index 2c13a113239..fc3097631ff 100644
---
a/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java
+++
b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java
@@ -16,96 +16,19 @@
*/
package org.apache.solr.analytics.facet;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import org.apache.solr.analytics.SolrAnalyticsTestCase;
import org.junit.BeforeClass;
import org.junit.Test;
public class QueryFacetTest extends SolrAnalyticsFacetTestCase {
@BeforeClass
- public static void populate() throws Exception {
- for (int j = 0; j < NUM_LOOPS; ++j) {
- int i = j % INT;
- long l = j % LONG;
- float f = j % FLOAT;
- double d = j % DOUBLE;
- String dt = (1800 + j % DATE) + "-12-31T23:59:59Z";
- String dtm = (1800 + j % DATE + 10) + "-12-31T23:59:59Z";
- String s = "str" + (j % STRING);
- List<String> fields = new ArrayList<>();
- fields.add("id");
- fields.add("1000" + j);
-
- if (i != 0) {
- fields.add("int_i");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + (i + 10));
- }
-
- if (l != 0l) {
- fields.add("long_l");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + (l + 10));
- }
-
- if (f != 0.0f) {
- fields.add("float_f");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + (f + 10));
- }
-
- if (d != 0.0d) {
- fields.add("double_d");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + (d + 10));
- }
-
- if ((j % DATE) != 0) {
- fields.add("date_dt");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dtm);
- }
-
- if ((j % STRING) != 0) {
- fields.add("string_s");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s + "_second");
- }
-
- addDoc(fields);
- }
- commitDocs();
+ public static void populate() {
+ SolrAnalyticsTestCase.populateDocsForAnalyticsTests();
}
- public static final int INT = 7;
- public static final int LONG = 2;
- public static final int FLOAT = 6;
- public static final int DOUBLE = 5;
- public static final int DATE = 3;
- public static final int STRING = 4;
- public static final int NUM_LOOPS = 20;
-
@Test
public void queryFacetTest() throws Exception {
Map<String, String> expressions = new HashMap<>();
diff --git
a/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java
b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java
index 0bc61edaba7..e99c514ecb5 100644
---
a/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java
+++
b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java
@@ -16,96 +16,19 @@
*/
package org.apache.solr.analytics.facet;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import org.apache.solr.analytics.SolrAnalyticsTestCase;
import org.junit.BeforeClass;
import org.junit.Test;
public class RangeFacetTest extends SolrAnalyticsFacetTestCase {
@BeforeClass
- public static void populate() throws Exception {
- for (int j = 0; j < NUM_LOOPS; ++j) {
- int i = j % INT;
- long l = j % LONG;
- float f = j % FLOAT;
- double d = j % DOUBLE;
- String dt = (1800 + j % DATE) + "-12-31T23:59:59Z";
- String dtm = (1800 + j % DATE + 10) + "-12-31T23:59:59Z";
- String s = "str" + (j % STRING);
- List<String> fields = new ArrayList<>();
- fields.add("id");
- fields.add("1000" + j);
-
- if (i != 0) {
- fields.add("int_i");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + (i + 10));
- }
-
- if (l != 0l) {
- fields.add("long_l");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + (l + 10));
- }
-
- if (f != 0.0f) {
- fields.add("float_f");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + (f + 10));
- }
-
- if (d != 0.0d) {
- fields.add("double_d");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + (d + 10));
- }
-
- if ((j % DATE) != 0) {
- fields.add("date_dt");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dtm);
- }
-
- if ((j % STRING) != 0) {
- fields.add("string_s");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s + "_second");
- }
-
- addDoc(fields);
- }
- commitDocs();
+ public static void populate() {
+ SolrAnalyticsTestCase.populateDocsForAnalyticsTests();
}
- public static final int INT = 7;
- public static final int LONG = 2;
- public static final int FLOAT = 6;
- public static final int DOUBLE = 5;
- public static final int DATE = 3;
- public static final int STRING = 4;
- public static final int NUM_LOOPS = 20;
-
@Test
public void intRangeHardEndTest() throws Exception {
Map<String, String> expressions = new HashMap<>();
diff --git
a/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/ValueFacetTest.java
b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/ValueFacetTest.java
index 012146e92e4..5c216545608 100644
---
a/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/ValueFacetTest.java
+++
b/solr/modules/analytics/src/test/org/apache/solr/analytics/facet/ValueFacetTest.java
@@ -16,96 +16,19 @@
*/
package org.apache.solr.analytics.facet;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import org.apache.solr.analytics.SolrAnalyticsTestCase;
import org.junit.BeforeClass;
import org.junit.Test;
public class ValueFacetTest extends SolrAnalyticsFacetTestCase {
@BeforeClass
- public static void populate() throws Exception {
- for (int j = 0; j < NUM_LOOPS; ++j) {
- int i = j % INT;
- long l = j % LONG;
- float f = j % FLOAT;
- double d = j % DOUBLE;
- String dt = (1800 + j % DATE) + "-12-31T23:59:59Z";
- String dtm = (1800 + j % DATE + 10) + "-12-31T23:59:59Z";
- String s = "str" + (j % STRING);
- List<String> fields = new ArrayList<>();
- fields.add("id");
- fields.add("1000" + j);
-
- if (i != 0) {
- fields.add("int_i");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + i);
- fields.add("int_im");
- fields.add("" + (i + 10));
- }
-
- if (l != 0l) {
- fields.add("long_l");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + l);
- fields.add("long_lm");
- fields.add("" + (l + 10));
- }
-
- if (f != 0.0f) {
- fields.add("float_f");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + f);
- fields.add("float_fm");
- fields.add("" + (f + 10));
- }
-
- if (d != 0.0d) {
- fields.add("double_d");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + d);
- fields.add("double_dm");
- fields.add("" + (d + 10));
- }
-
- if ((j % DATE) != 0) {
- fields.add("date_dt");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dt);
- fields.add("date_dtm");
- fields.add(dtm);
- }
-
- if ((j % STRING) != 0) {
- fields.add("string_s");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s);
- fields.add("string_sm");
- fields.add(s + "_second");
- }
-
- addDoc(fields);
- }
- commitDocs();
+ public static void populate() {
+ SolrAnalyticsTestCase.populateDocsForAnalyticsTests();
}
- public static final int INT = 7;
- public static final int LONG = 2;
- public static final int FLOAT = 6;
- public static final int DOUBLE = 5;
- public static final int DATE = 3;
- public static final int STRING = 4;
- public static final int NUM_LOOPS = 20;
-
@Test
public void countTest() throws Exception {
Map<String, String> expressions = new HashMap<>();
