You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/11/02 11:16:14 UTC

[05/56] lucene-solr:jira/gradle: Add :solr:contrib:analytics module

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f0366b94/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetCloudTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetCloudTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetCloudTest.java
deleted file mode 100644
index 7489f3f..0000000
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetCloudTest.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.analytics.legacy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.solr.client.solrj.request.UpdateRequest;
-import org.apache.solr.common.util.NamedList;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class LegacyNoFacetCloudTest extends LegacyAbstractAnalyticsCloudTest {
-  static public final int INT = 71;
-  static public final int LONG = 36;
-  static public final int FLOAT = 93;
-  static public final int DOUBLE = 49;
-  static public final int DATE = 12;
-  static public final int STRING = 28;
-  static public final int NUM_LOOPS = 100;
-  
-  //INT
-  static ArrayList<Integer> intTestStart; 
-  static long intMissing = 0;
-  
-  //LONG
-  static ArrayList<Long> longTestStart; 
-  static long longMissing = 0;
-  
-  //FLOAT
-  static ArrayList<Float> floatTestStart; 
-  static long floatMissing = 0;
-  
-  //DOUBLE
-  static ArrayList<Double> doubleTestStart; 
-  static long doubleMissing = 0;
-  
-  //DATE
-  static ArrayList<String> dateTestStart; 
-  static long dateMissing = 0;
-  
-  //STR
-  static ArrayList<String> stringTestStart; 
-  static long stringMissing = 0;
-  
-  @BeforeClass
-  public static void populate() throws Exception {
-    cleanIndex();
-    
-    intTestStart = new ArrayList<>();
-    longTestStart = new ArrayList<>();
-    floatTestStart = new ArrayList<>();
-    doubleTestStart = new ArrayList<>();
-    dateTestStart = new ArrayList<>();
-    stringTestStart = new ArrayList<>();
-    
-    UpdateRequest req = new UpdateRequest();
-    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 s = "str" + (j%STRING);
-      List<String> fields = new ArrayList<>();
-      fields.add("id"); fields.add("1000"+j);
-      
-      if( i != 0 ){
-        fields.add("int_id"); fields.add("" + i);
-        intTestStart.add(i);
-      } else intMissing++;
-      
-      if( l != 0l ){
-        fields.add("long_ld"); fields.add("" + l);
-        longTestStart.add(l);
-      } else longMissing++;
-      
-      if( f != 0.0f ){
-        fields.add("float_fd"); fields.add("" + f);
-        floatTestStart.add(f);
-      } else floatMissing++;
-      
-      if( d != 0.0d ){
-        fields.add("double_dd"); fields.add("" + d);
-        doubleTestStart.add(d);
-      } else doubleMissing++;
-      
-      if( (j%DATE) != 0 ){
-        fields.add("date_dtd"); fields.add(dt);
-        dateTestStart.add(dt);
-      } else dateMissing++;
-      
-      if( (j%STRING) != 0 ){
-        fields.add("string_sd"); fields.add(s);
-        stringTestStart.add(s);
-      } else stringMissing++;
-
-      req.add(fields.toArray(new String[0]));
-    }
-    req.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
-  }
-      
-  @Test
-  public void sumTest() throws Exception {
-    String[] params = new String[] {
-        "o.sr.s.int_id", "sum(int_id)",
-        "o.sr.s.long_ld", "sum(long_ld)",
-        "o.sr.s.float_fd", "sum(float_fd)",
-        "o.sr.s.double_dd", "sum(double_dd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int
-    Double intResult = getValue(response, "sr", "int_id");
-    Double intTest = (Double)calculateNumberStat(intTestStart, "sum");
-    assertEquals(responseStr, intResult,intTest);
-    
-    //Long
-    Double longResult = getValue(response, "sr", "long_ld");
-    Double longTest = (Double)calculateNumberStat(longTestStart, "sum");
-    assertEquals(responseStr, longResult,longTest);
-    
-    //Float
-    Double floatResult = getValue(response, "sr", "float_fd");
-    Double floatTest = (Double)calculateNumberStat(floatTestStart, "sum");
-    assertEquals(responseStr, floatResult,floatTest);
-    
-    //Double
-    Double doubleResult = getValue(response, "sr", "double_dd");
-        Double doubleTest = (Double) calculateNumberStat(doubleTestStart, "sum");
-    assertEquals(responseStr, doubleResult,doubleTest);
-  }
-  
-  @Test
-  public void meanTest() throws Exception { 
-    String[] params = new String[] {
-        "o.mr.s.int_id", "mean(int_id)",
-        "o.mr.s.long_ld", "mean(long_ld)",
-        "o.mr.s.float_fd", "mean(float_fd)",
-        "o.mr.s.double_dd", "mean(double_dd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int
-    Double intResult = getValue(response, "mr", "int_id");
-    Double intTest = (Double)calculateNumberStat(intTestStart, "mean");
-    assertEquals(responseStr, intResult,intTest);
-    
-    //Long
-    Double longResult = getValue(response, "mr", "long_ld");
-    Double longTest = (Double)calculateNumberStat(longTestStart, "mean");
-    assertEquals(responseStr, longResult,longTest);
-    
-    //Float
-    Double floatResult = getValue(response, "mr", "float_fd");
-    Double floatTest = (Double)calculateNumberStat(floatTestStart, "mean");
-    assertEquals(responseStr, floatResult,floatTest);
-    
-    //Double
-    Double doubleResult = getValue(response, "mr", "double_dd");
-    Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "mean");
-    assertEquals(responseStr, doubleResult,doubleTest);
-  }
-  
-  @Test
-  public void stddevTest() throws Exception { 
-    String[] params = new String[] {
-        "o.str.s.int_id", "stddev(int_id)",
-        "o.str.s.long_ld", "stddev(long_ld)",
-        "o.str.s.float_fd", "stddev(float_fd)",
-        "o.str.s.double_dd", "stddev(double_dd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int
-    Double intResult = getValue(response, "str", "int_id");
-    Double intTest = (Double)calculateNumberStat(intTestStart, "stddev");
-    assertEquals(responseStr, intResult, intTest, 0.00000000001);
-    
-    //Long
-    Double longResult = getValue(response, "str", "long_ld");
-    Double longTest = (Double)calculateNumberStat(longTestStart, "stddev");
-    assertEquals(responseStr, longResult, longTest, 0.00000000001);
-    
-    //Float
-    Double floatResult = getValue(response, "str", "float_fd");
-    Double floatTest = (Double)calculateNumberStat(floatTestStart, "stddev");
-    assertEquals(responseStr, floatResult, floatTest, 0.00000000001);
-
-
-    //Double
-    Double doubleResult = getValue(response, "str", "double_dd");
-    Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "stddev");
-    assertEquals(responseStr, doubleResult, doubleTest, 0.00000000001);
-  }
-  
-  @Test
-  public void medianTest() throws Exception { 
-    String[] params = new String[] {
-        "o.medr.s.int_id", "median(int_id)",
-        "o.medr.s.long_ld", "median(long_ld)",
-        "o.medr.s.float_fd", "median(float_fd)",
-        "o.medr.s.double_dd", "median(double_dd)",
-        "o.medr.s.date_dtd", "median(date_dtd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int
-    Double intResult = getValue(response, "medr", "int_id");
-    Double intTest = (Double)calculateNumberStat(intTestStart, "median");
-    assertEquals(responseStr, intResult,intTest);
-    
-    //Long
-    Double longResult = getValue(response, "medr", "long_ld");
-    Double longTest = (Double)calculateNumberStat(longTestStart, "median");
-    assertEquals(responseStr, longResult,longTest);
-    
-    //Float
-    Double floatResult = getValue(response, "medr", "float_fd");
-    Double floatTest = (Double)calculateNumberStat(floatTestStart, "median");
-    assertEquals(responseStr, floatResult,floatTest);
-    
-    //Double
-    Double doubleResult = getValue(response, "medr", "double_dd");
-    Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "median");
-    assertEquals(responseStr, doubleResult,doubleTest);
-    
-    // TODO: Add test for date median
-  }
-  
-  @Test
-  public void perc20Test() throws Exception {
-    String[] params = new String[] {
-        "o.p2r.s.int_id", "percentile(20,int_id)",
-        "o.p2r.s.long_ld", "percentile(20,long_ld)",
-        "o.p2r.s.float_fd", "percentile(20,float_fd)",
-        "o.p2r.s.double_dd", "percentile(20,double_dd)",
-        "o.p2r.s.date_dtd", "string(percentile(20,date_dtd))",
-        "o.p2r.s.string_sd", "percentile(20,string_sd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int 20
-    Integer intResult = getValue(response, "p2r", "int_id");
-    Integer intTest = (Integer)calculateStat(intTestStart, "perc_20");
-    assertEquals(responseStr, intResult,intTest);
-
-    //Long 20
-    Long longResult = getValue(response, "p2r", "long_ld");
-    Long longTest = (Long)calculateStat(longTestStart, "perc_20");
-    assertEquals(responseStr, longResult,longTest);
-
-    //Float 20
-    Float floatResult = getValue(response, "p2r", "float_fd");
-    Float floatTest = (Float)calculateStat(floatTestStart, "perc_20");
-    assertEquals(responseStr, floatResult,floatTest);
-
-    //Double 20
-    Double doubleResult = getValue(response, "p2r", "double_dd");
-    Double doubleTest = (Double)calculateStat(doubleTestStart, "perc_20");
-    assertEquals(responseStr, doubleResult,doubleTest);
-
-    //Date 20
-    String dateResult = getValue(response, "p2r", "date_dtd");
-    String dateTest = (String)calculateStat(dateTestStart, "perc_20");
-    assertEquals(responseStr, dateResult,dateTest);
-
-    //String 20
-    String stringResult = getValue(response, "p2r", "string_sd");
-    String stringTest = (String)calculateStat(stringTestStart, "perc_20");
-    assertEquals(responseStr, stringResult,stringTest);
-  }
-  
-  @Test
-  public void perc60Test() throws Exception { 
-    String[] params = new String[] {
-        "o.p6r.s.int_id", "percentile(60,int_id)",
-        "o.p6r.s.long_ld", "percentile(60,long_ld)",
-        "o.p6r.s.float_fd", "percentile(60,float_fd)",
-        "o.p6r.s.double_dd", "percentile(60,double_dd)",
-        "o.p6r.s.date_dtd", "string(percentile(60,date_dtd))",
-        "o.p6r.s.string_sd", "percentile(60,string_sd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int 60
-    Integer intResult = getValue(response, "p6r", "int_id");
-    Integer intTest = (Integer)calculateStat(intTestStart, "perc_60");
-    assertEquals(responseStr, intResult,intTest);
-
-    //Long 60
-    Long longResult = getValue(response, "p6r", "long_ld");
-    Long longTest = (Long)calculateStat(longTestStart, "perc_60");
-    assertEquals(responseStr, longResult,longTest);
-
-    //Float 60
-    Float floatResult = getValue(response, "p6r", "float_fd");
-    Float floatTest = (Float)calculateStat(floatTestStart, "perc_60");
-    assertEquals(responseStr, floatResult,floatTest);
-
-    //Double 60
-    Double doubleResult = getValue(response, "p6r", "double_dd");
-    Double doubleTest = (Double)calculateStat(doubleTestStart, "perc_60");
-    assertEquals(responseStr, doubleResult,doubleTest);
-
-    //Date 60
-    String dateResult = getValue(response, "p6r", "date_dtd");
-    String dateTest = (String)calculateStat(dateTestStart, "perc_60");
-    assertEquals(responseStr, dateResult,dateTest);
-
-    //String 60
-    String stringResult = getValue(response, "p6r", "string_sd");
-    String stringTest = (String)calculateStat(stringTestStart, "perc_60");
-    assertEquals(responseStr, stringResult,stringTest);
-  }
-  
-  @Test
-  public void minTest() throws Exception { 
-    String[] params = new String[] {
-        "o.mir.s.int_id", "min(int_id)",
-        "o.mir.s.long_ld", "min(long_ld)",
-        "o.mir.s.float_fd", "min(float_fd)",
-        "o.mir.s.double_dd", "min(double_dd)",
-        "o.mir.s.date_dtd", "string(min(date_dtd))",
-        "o.mir.s.string_sd", "min(string_sd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int
-    Integer intResult = getValue(response, "mir", "int_id");
-    Integer intTest = (Integer)calculateStat(intTestStart, "min");
-    assertEquals(responseStr, intResult,intTest);
-
-    //Long
-    Long longResult = getValue(response, "mir", "long_ld");
-    Long longTest = (Long)calculateStat(longTestStart, "min");
-    assertEquals(responseStr, longResult,longTest);
-
-    //Float
-    Float floatResult = getValue(response, "mir", "float_fd");
-    Float floatTest = (Float)calculateStat(floatTestStart, "min");
-    assertEquals(responseStr, floatResult,floatTest);
-
-    //Double
-    Double doubleResult = getValue(response, "mir", "double_dd");
-    Double doubleTest = (Double)calculateStat(doubleTestStart, "min");
-    assertEquals(responseStr, doubleResult,doubleTest);
-
-    //Date
-    String dateResult = getValue(response, "mir", "date_dtd");
-    String dateTest = (String)calculateStat(dateTestStart, "min");
-    assertEquals(responseStr, dateResult,dateTest);
-
-    //String
-    String stringResult = getValue(response, "mir", "string_sd");
-    String stringTest = (String)calculateStat(stringTestStart, "min");
-    assertEquals(responseStr, stringResult,stringTest);
-  }
-  
-  @Test
-  public void maxTest() throws Exception { 
-    String[] params = new String[] {
-        "o.mar.s.int_id", "max(int_id)",
-        "o.mar.s.long_ld", "max(long_ld)",
-        "o.mar.s.float_fd", "max(float_fd)",
-        "o.mar.s.double_dd", "max(double_dd)",
-        "o.mar.s.date_dtd", "string(max(date_dtd))",
-        "o.mar.s.string_sd", "max(string_sd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int
-    Integer intResult = getValue(response, "mar", "int_id");
-    Integer intTest = (Integer)calculateStat(intTestStart, "max");
-    assertEquals(responseStr, intResult,intTest);
-
-    //Long
-    Long longResult = getValue(response, "mar", "long_ld");
-    Long longTest = (Long)calculateStat(longTestStart, "max");
-    assertEquals(responseStr, longResult,longTest);
-
-    //Float
-    Float floatResult = getValue(response, "mar", "float_fd");
-    Float floatTest = (Float)calculateStat(floatTestStart, "max");
-    assertEquals(responseStr, floatResult,floatTest);
-
-    //Double
-    Double doubleResult = getValue(response, "mar", "double_dd");
-    Double doubleTest = (Double)calculateStat(doubleTestStart, "max");
-    assertEquals(responseStr, doubleResult,doubleTest);
-
-    //Date
-    String dateResult = getValue(response, "mar", "date_dtd");
-    String dateTest = (String)calculateStat(dateTestStart, "max");
-    assertEquals(responseStr, dateResult,dateTest);
-
-    //String
-    String stringResult = getValue(response, "mar", "string_sd");
-    String stringTest = (String)calculateStat(stringTestStart, "max");
-    assertEquals(responseStr, stringResult,stringTest);
-  }
-  
-  @Test
-  public void uniqueTest() throws Exception { 
-    String[] params = new String[] {
-        "o.ur.s.int_id", "unique(int_id)",
-        "o.ur.s.long_ld", "unique(long_ld)",
-        "o.ur.s.float_fd", "unique(float_fd)",
-        "o.ur.s.double_dd", "unique(double_dd)",
-        "o.ur.s.date_dtd", "unique(date_dtd)",
-        "o.ur.s.string_sd", "unique(string_sd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int
-    Long intResult = getValue(response, "ur", "int_id");
-    Long intTest = (Long)calculateStat(intTestStart, "unique");
-    assertEquals(responseStr, intResult,intTest);
-
-    //Long
-    Long longResult = getValue(response, "ur", "long_ld");
-    Long longTest = (Long)calculateStat(longTestStart, "unique");
-    assertEquals(responseStr, longResult,longTest);
-
-    //Float
-    Long floatResult = getValue(response, "ur", "float_fd");
-    Long floatTest = (Long)calculateStat(floatTestStart, "unique");
-    assertEquals(responseStr, floatResult,floatTest);
-
-    //Double
-    Long doubleResult = getValue(response, "ur", "double_dd");
-    Long doubleTest = (Long)calculateStat(doubleTestStart, "unique");
-    assertEquals(responseStr, doubleResult,doubleTest);
-
-    //Date
-    Long dateResult = getValue(response, "ur", "date_dtd");
-    Long dateTest = (Long)calculateStat(dateTestStart, "unique");
-    assertEquals(responseStr, dateResult,dateTest);
-
-    //String
-    Long stringResult = getValue(response, "ur", "string_sd");
-    Long stringTest = (Long)calculateStat(stringTestStart, "unique");
-    assertEquals(responseStr, stringResult,stringTest);
-  }
-  
-  @Test
-  public void countTest() throws Exception { 
-    String[] params = new String[] {
-        "o.cr.s.int_id", "count(int_id)",
-        "o.cr.s.long_ld", "count(long_ld)",
-        "o.cr.s.float_fd", "count(float_fd)",
-        "o.cr.s.double_dd", "count(double_dd)",
-        "o.cr.s.date_dtd", "count(date_dtd)",
-        "o.cr.s.string_sd", "count(string_sd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int
-    Long intResult = getValue(response, "cr", "int_id");
-    Long intTest = (Long)calculateStat(intTestStart, "count");
-    assertEquals(responseStr, intResult,intTest);
-
-    //Long
-    Long longResult = getValue(response, "cr", "long_ld");
-    Long longTest = (Long)calculateStat(longTestStart, "count");
-    assertEquals(responseStr, longResult,longTest);
-
-    //Float
-    Long floatResult = getValue(response, "cr", "float_fd");
-    Long floatTest = (Long)calculateStat(floatTestStart, "count");
-    assertEquals(responseStr, floatResult,floatTest);
-
-    //Double
-    Long doubleResult = getValue(response, "cr", "double_dd");
-    Long doubleTest = (Long)calculateStat(doubleTestStart, "count");
-    assertEquals(responseStr, doubleResult,doubleTest);
-
-    //Date
-    Long dateResult = getValue(response, "cr", "date_dtd");
-    Long dateTest = (Long)calculateStat(dateTestStart, "count");
-    assertEquals(responseStr, dateResult,dateTest);
-
-    //String
-    Long stringResult = getValue(response, "cr", "string_sd");
-    Long stringTest = (Long)calculateStat(stringTestStart, "count");
-    assertEquals(responseStr, stringResult,stringTest);
-  }  
-    
-  @Test
-  public void missingDefaultTest() throws Exception { 
-    String[] params = new String[] {
-        "o.misr.s.int_id", "missing(int_id)",
-        "o.misr.s.long_ld", "missing(long_ld)",
-        "o.misr.s.float_fd", "missing(float_fd)",
-        "o.misr.s.double_dd", "missing(double_dd)",
-        "o.misr.s.date_dtd", "missing(date_dtd)",
-        "o.misr.s.string_sd", "missing(string_sd)"
-    };
-    NamedList<Object> response = queryLegacyCloudAnalytics(params);
-    String responseStr = response.toString();
-    
-    //Int
-    long intResult = getValue(response, "misr", "int_id");
-    assertEquals(responseStr, intMissing,intResult);
-
-    //Long
-    long longResult = getValue(response, "misr", "long_ld");
-    assertEquals(responseStr, longMissing,longResult);
-
-    //Float
-    long floatResult = getValue(response, "misr", "float_fd");
-    assertEquals(responseStr, floatMissing,floatResult);
-
-    //Double
-    long doubleResult = getValue(response, "misr", "double_dd");
-    assertEquals(responseStr, doubleMissing,doubleResult);
-
-    //Date
-    long dateResult = getValue(response, "misr", "date_dtd");
-    assertEquals(responseStr, dateMissing,dateResult);
-
-    //String
-    long stringResult = getValue(response, "misr", "string_sd");
-    assertEquals(responseStr, stringMissing, stringResult);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f0366b94/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetTest.java
deleted file mode 100644
index 7f8a5d7..0000000
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyNoFacetTest.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.analytics.legacy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class LegacyNoFacetTest extends LegacyAbstractAnalyticsTest {
-  static String fileName = "noFacets.txt";
-
-  static public final int INT = 71;
-  static public final int LONG = 36;
-  static public final int FLOAT = 93;
-  static public final int DOUBLE = 49;
-  static public final int DATE = 12;
-  static public final int STRING = 28;
-  static public final int NUM_LOOPS = 100;
-  
-  //INT
-  static ArrayList<Integer> intTestStart; 
-  static long intMissing = 0;
-  
-  //LONG
-  static ArrayList<Long> longTestStart; 
-  static long longMissing = 0;
-  
-  //FLOAT
-  static ArrayList<Float> floatTestStart; 
-  static long floatMissing = 0;
-  
-  //DOUBLE
-  static ArrayList<Double> doubleTestStart; 
-  static long doubleMissing = 0;
-  
-  //DATE
-  static ArrayList<String> dateTestStart; 
-  static long dateMissing = 0;
-  
-  //STR
-  static ArrayList<String> stringTestStart; 
-  static long stringMissing = 0;
-  
-  @BeforeClass
-  public static void beforeClass() throws Exception {
-    initCore("solrconfig-analytics.xml","schema-analytics.xml");
-    h.update("<delete><query>*:*</query></delete>");
-    defaults.put("int_id", 0);
-    defaults.put("long_ld", 0L);
-    defaults.put("float_fd", (float) 0);
-    defaults.put("double_dd", (double) 0);
-    defaults.put("date_dtd", "1800-12-31T23:59:59Z");
-    defaults.put("string_sd", "str0");
-    
-    intTestStart = new ArrayList<>();
-    longTestStart = new ArrayList<>();
-    floatTestStart = new ArrayList<>();
-    doubleTestStart = new ArrayList<>();
-    dateTestStart = new ArrayList<>();
-    stringTestStart = new ArrayList<>();
-    
-    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 s = "str" + (j%STRING);
-      List<String> fields = new ArrayList<>();
-      fields.add("id"); fields.add("1000"+j);
-      
-      if( i != 0 ){
-        fields.add("int_id"); fields.add("" + i);
-        intTestStart.add(i);
-      } else intMissing++;
-      
-      if( l != 0l ){
-        fields.add("long_ld"); fields.add("" + l);
-        longTestStart.add(l);
-      } else longMissing++;
-      
-      if( f != 0.0f ){
-        fields.add("float_fd"); fields.add("" + f);
-        floatTestStart.add(f);
-      } else floatMissing++;
-      
-      if( d != 0.0d ){
-        fields.add("double_dd"); fields.add("" + d);
-        doubleTestStart.add(d);
-      } else doubleMissing++;
-      
-      if( (j%DATE) != 0 ){
-        fields.add("date_dtd"); fields.add(dt);
-        dateTestStart.add(dt);
-      } else dateMissing++;
-      
-      if( (j%STRING) != 0 ){
-        fields.add("string_sd"); fields.add(s);
-        stringTestStart.add(s);
-      } else stringMissing++;
-      
-      assertU(adoc(fields.toArray(new String[0])));
-      
-      
-      if (usually()) {
-        assertU(commit());  // to have several segments
-      }
-    }
-    
-    assertU(commit()); 
-    
-    //Sort ascending tests
-    setResponse(h.query(request(fileToStringArr(LegacyNoFacetTest.class, fileName))));
-  }
-      
-  @Test
-  public void sumTest() throws Exception {
-    //Int
-    Double intResult = (Double)getStatResult("sr", "int_id", VAL_TYPE.DOUBLE);
-    Double intTest = (Double)calculateNumberStat(intTestStart, "sum");
-    assertEquals(getRawResponse(), intResult,intTest);
-    
-    //Long
-    Double longResult = (Double)getStatResult("sr", "long_ld", VAL_TYPE.DOUBLE);
-    Double longTest = (Double)calculateNumberStat(longTestStart, "sum");
-    assertEquals(getRawResponse(), longResult,longTest);
-    
-    //Float
-    Double floatResult = (Double)getStatResult("sr", "float_fd", VAL_TYPE.DOUBLE);
-    Double floatTest = (Double)calculateNumberStat(floatTestStart, "sum");
-    assertEquals(getRawResponse(), floatResult,floatTest);
-    
-    //Double
-    Double doubleResult = (Double)getStatResult("sr", "double_dd", VAL_TYPE.DOUBLE);
-        Double doubleTest = (Double) calculateNumberStat(doubleTestStart, "sum");
-    assertEquals(getRawResponse(), doubleResult,doubleTest);
-  }
-  
-  @Test
-  public void meanTest() throws Exception { 
-    //Int
-    Double intResult = (Double)getStatResult("mr", "int_id", VAL_TYPE.DOUBLE);
-    Double intTest = (Double)calculateNumberStat(intTestStart, "mean");
-    assertEquals(getRawResponse(), intResult,intTest);
-    
-    //Long
-    Double longResult = (Double)getStatResult("mr", "long_ld", VAL_TYPE.DOUBLE);
-    Double longTest = (Double)calculateNumberStat(longTestStart, "mean");
-    assertEquals(getRawResponse(), longResult,longTest);
-    
-    //Float
-    Double floatResult = (Double)getStatResult("mr", "float_fd", VAL_TYPE.DOUBLE);
-    Double floatTest = (Double)calculateNumberStat(floatTestStart, "mean");
-    assertEquals(getRawResponse(), floatResult,floatTest);
-    
-    //Double
-    Double doubleResult = (Double)getStatResult("mr", "double_dd", VAL_TYPE.DOUBLE);
-    Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "mean");
-    assertEquals(getRawResponse(), doubleResult,doubleTest);
-  }
-  
-  @Test
-  public void stddevTest() throws Exception { 
-    //Int
-    Double intResult = (Double)getStatResult("str", "int_id", VAL_TYPE.DOUBLE);
-    Double intTest = (Double)calculateNumberStat(intTestStart, "stddev");
-    assertEquals(getRawResponse(), intResult, intTest, 0.00000000001);
-    
-    //Long
-    Double longResult = (Double)getStatResult("str", "long_ld", VAL_TYPE.DOUBLE);
-    Double longTest = (Double)calculateNumberStat(longTestStart, "stddev");
-    assertEquals(getRawResponse(), longResult, longTest, 0.00000000001);
-    
-    //Float
-    Double floatResult = (Double)getStatResult("str", "float_fd", VAL_TYPE.DOUBLE);
-    Double floatTest = (Double)calculateNumberStat(floatTestStart, "stddev");
-    assertEquals(getRawResponse(), floatResult, floatTest, 0.00000000001);
-
-
-    //Double
-    Double doubleResult = (Double)getStatResult("str", "double_dd", VAL_TYPE.DOUBLE);
-    Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "stddev");
-    assertEquals(getRawResponse(), doubleResult, doubleTest, 0.00000000001);
-  }
-  
-  @Test
-  public void medianTest() throws Exception { 
-    //Int
-    Double intResult = (Double)getStatResult("medr", "int_id", VAL_TYPE.DOUBLE);
-    Double intTest = (Double)calculateNumberStat(intTestStart, "median");
-    assertEquals(getRawResponse(), intResult,intTest);
-    
-    //Long
-    Double longResult = (Double)getStatResult("medr", "long_ld", VAL_TYPE.DOUBLE);
-    Double longTest = (Double)calculateNumberStat(longTestStart, "median");
-    assertEquals(getRawResponse(), longResult,longTest);
-    
-    //Float
-    Double floatResult = (Double)getStatResult("medr", "float_fd", VAL_TYPE.DOUBLE);
-    Double floatTest = (Double)calculateNumberStat(floatTestStart, "median");
-    assertEquals(getRawResponse(), floatResult,floatTest);
-    
-    //Double
-    Double doubleResult = (Double)getStatResult("medr", "double_dd", VAL_TYPE.DOUBLE);
-    Double doubleTest = (Double)calculateNumberStat(doubleTestStart, "median");
-    assertEquals(getRawResponse(), doubleResult,doubleTest);
-  }
-  
-  @Test
-  public void perc20Test() throws Exception {
-    //Int 20
-    Integer intResult = (Integer)getStatResult("p2r", "int_id", VAL_TYPE.INTEGER);
-    Integer intTest = (Integer)calculateStat(intTestStart, "perc_20");
-    assertEquals(getRawResponse(), intResult,intTest);
-
-    //Long 20
-    Long longResult = (Long)getStatResult("p2r", "long_ld", VAL_TYPE.LONG);
-    Long longTest = (Long)calculateStat(longTestStart, "perc_20");
-    assertEquals(getRawResponse(), longResult,longTest);
-
-    //Float 20
-    Float floatResult = (Float)getStatResult("p2r", "float_fd", VAL_TYPE.FLOAT);
-    Float floatTest = (Float)calculateStat(floatTestStart, "perc_20");
-    //assertEquals(getRawResponse(), floatResult,floatTest);
-
-    //Double 20
-    Double doubleResult = (Double)getStatResult("p2r", "double_dd", VAL_TYPE.DOUBLE);
-    Double doubleTest = (Double)calculateStat(doubleTestStart, "perc_20");
-    assertEquals(getRawResponse(), doubleResult,doubleTest);
-
-    //Date 20
-    String dateResult = (String)getStatResult("p2r", "date_dtd", VAL_TYPE.DATE);
-    String dateTest = (String)calculateStat(dateTestStart, "perc_20");
-    assertEquals(getRawResponse(), dateResult,dateTest);
-
-    //String 20
-    String stringResult = (String)getStatResult("p2r", "string_sd", VAL_TYPE.STRING);
-    String stringTest = (String)calculateStat(stringTestStart, "perc_20");
-    assertEquals(getRawResponse(), stringResult,stringTest);
-  }
-  
-  @Test
-  public void perc60Test() throws Exception { 
-    //Int 60
-    Integer intResult = (Integer)getStatResult("p6r", "int_id", VAL_TYPE.INTEGER);
-    Integer intTest = (Integer)calculateStat(intTestStart, "perc_60");
-    assertEquals(getRawResponse(), intResult,intTest);
-
-    //Long 60
-    Long longResult = (Long)getStatResult("p6r", "long_ld", VAL_TYPE.LONG);
-    Long longTest = (Long)calculateStat(longTestStart, "perc_60");
-    assertEquals(getRawResponse(), longResult,longTest);
-
-    //Float 60
-    Float floatResult = (Float)getStatResult("p6r", "float_fd", VAL_TYPE.FLOAT);
-    Float floatTest = (Float)calculateStat(floatTestStart, "perc_60");
-    assertEquals(getRawResponse(), floatResult,floatTest);
-
-    //Double 60
-    Double doubleResult = (Double)getStatResult("p6r", "double_dd", VAL_TYPE.DOUBLE);
-    Double doubleTest = (Double)calculateStat(doubleTestStart, "perc_60");
-    assertEquals(getRawResponse(), doubleResult,doubleTest);
-
-    //Date 60
-    String dateResult = (String)getStatResult("p6r", "date_dtd", VAL_TYPE.DATE);
-    String dateTest = (String)calculateStat(dateTestStart, "perc_60");
-    assertEquals(getRawResponse(), dateResult,dateTest);
-
-    //String 60
-    String stringResult = (String)getStatResult("p6r", "string_sd", VAL_TYPE.STRING);
-    String stringTest = (String)calculateStat(stringTestStart, "perc_60");
-    assertEquals(getRawResponse(), stringResult,stringTest);
-  }
-  
-  @Test
-  public void minTest() throws Exception { 
-    //Int
-    Integer intResult = ((Integer)getStatResult("mir", "int_id", VAL_TYPE.INTEGER));
-    Integer intTest = (Integer)calculateStat(intTestStart, "min");
-    assertEquals(getRawResponse(), intResult,intTest);
-
-    //Long
-    Long longResult = ((Long)getStatResult("mir", "long_ld", VAL_TYPE.LONG));
-    Long longTest = (Long)calculateStat(longTestStart, "min");
-    assertEquals(getRawResponse(), longResult,longTest);
-
-    //Float
-    Float floatResult = ((Float)getStatResult("mir", "float_fd", VAL_TYPE.FLOAT));
-    Float floatTest = (Float)calculateStat(floatTestStart, "min");
-    assertEquals(getRawResponse(), floatResult,floatTest);
-
-    //Double
-    Double doubleResult = (Double)getStatResult("mir", "double_dd", VAL_TYPE.DOUBLE);
-    Double doubleTest = (Double)calculateStat(doubleTestStart, "min");
-    assertEquals(getRawResponse(), doubleResult,doubleTest);
-
-    //Date
-    String dateResult = (String)getStatResult("mir", "date_dtd", VAL_TYPE.DATE);
-    String dateTest = (String)calculateStat(dateTestStart, "min");
-    assertEquals(getRawResponse(), dateResult,dateTest);
-
-    //String
-    String stringResult = (String)getStatResult("mir", "string_sd", VAL_TYPE.STRING);
-    String stringTest = (String)calculateStat(stringTestStart, "min");
-    assertEquals(getRawResponse(), stringResult,stringTest);
-  }
-  
-  @Test
-  public void maxTest() throws Exception { 
-    //Int
-    Integer intResult = ((Integer)getStatResult("mar", "int_id", VAL_TYPE.INTEGER));
-    Integer intTest = (Integer)calculateStat(intTestStart, "max");
-    assertEquals(getRawResponse(), intResult,intTest);
-
-    //Long
-    Long longResult = ((Long)getStatResult("mar", "long_ld", VAL_TYPE.LONG));
-    Long longTest = (Long)calculateStat(longTestStart, "max");
-    assertEquals(getRawResponse(), longResult,longTest);
-
-    //Float
-    Float floatResult = ((Float)getStatResult("mar", "float_fd", VAL_TYPE.FLOAT));
-    Float floatTest = (Float)calculateStat(floatTestStart, "max");
-    assertEquals(getRawResponse(), floatResult,floatTest);
-
-    //Double
-    Double doubleResult = (Double)getStatResult("mar", "double_dd", VAL_TYPE.DOUBLE);
-    Double doubleTest = (Double)calculateStat(doubleTestStart, "max");
-    assertEquals(getRawResponse(), doubleResult,doubleTest);
-
-    //Date
-    String dateResult = (String)getStatResult("mar", "date_dtd", VAL_TYPE.DATE);
-    String dateTest = (String)calculateStat(dateTestStart, "max");
-    assertEquals(getRawResponse(), dateResult,dateTest);
-
-    //String
-    String stringResult = (String)getStatResult("mar", "string_sd", VAL_TYPE.STRING);
-    String stringTest = (String)calculateStat(stringTestStart, "max");
-    assertEquals(getRawResponse(), stringResult,stringTest);
-  }
-  
-  @Test
-  public void uniqueTest() throws Exception { 
-    //Int
-    Long intResult = (Long)getStatResult("ur", "int_id", VAL_TYPE.LONG);
-    Long intTest = (Long)calculateStat(intTestStart, "unique");
-    assertEquals(getRawResponse(), intResult,intTest);
-
-    //Long
-    Long longResult = (Long)getStatResult("ur", "long_ld", VAL_TYPE.LONG);
-    Long longTest = (Long)calculateStat(longTestStart, "unique");
-    assertEquals(getRawResponse(), longResult,longTest);
-
-    //Float
-    Long floatResult = (Long)getStatResult("ur", "float_fd", VAL_TYPE.LONG);
-    Long floatTest = (Long)calculateStat(floatTestStart, "unique");
-    assertEquals(getRawResponse(), floatResult,floatTest);
-
-    //Double
-    Long doubleResult = (Long)getStatResult("ur", "double_dd", VAL_TYPE.LONG);
-    Long doubleTest = (Long)calculateStat(doubleTestStart, "unique");
-    assertEquals(getRawResponse(), doubleResult,doubleTest);
-
-    //Date
-    Long dateResult = (Long)getStatResult("ur", "date_dtd", VAL_TYPE.LONG);
-    Long dateTest = (Long)calculateStat(dateTestStart, "unique");
-    assertEquals(getRawResponse(), dateResult,dateTest);
-
-    //String
-    Long stringResult = (Long)getStatResult("ur", "string_sd", VAL_TYPE.LONG);
-    Long stringTest = (Long)calculateStat(stringTestStart, "unique");
-    assertEquals(getRawResponse(), stringResult,stringTest);
-  }
-  
-  @Test
-  public void countTest() throws Exception { 
-    //Int
-    Long intResult = (Long)getStatResult("cr", "int_id", VAL_TYPE.LONG);
-    Long intTest = (Long)calculateStat(intTestStart, "count");
-    assertEquals(getRawResponse(), intResult,intTest);
-
-    //Long
-    Long longResult = (Long)getStatResult("cr", "long_ld", VAL_TYPE.LONG);
-    Long longTest = (Long)calculateStat(longTestStart, "count");
-    assertEquals(getRawResponse(), longResult,longTest);
-
-    //Float
-    Long floatResult = (Long)getStatResult("cr", "float_fd", VAL_TYPE.LONG);
-    Long floatTest = (Long)calculateStat(floatTestStart, "count");
-    assertEquals(getRawResponse(), floatResult,floatTest);
-
-    //Double
-    Long doubleResult = (Long)getStatResult("cr", "double_dd", VAL_TYPE.LONG);
-    Long doubleTest = (Long)calculateStat(doubleTestStart, "count");
-    assertEquals(getRawResponse(), doubleResult,doubleTest);
-
-    //Date
-    Long dateResult = (Long)getStatResult("cr", "date_dtd", VAL_TYPE.LONG);
-    Long dateTest = (Long)calculateStat(dateTestStart, "count");
-    assertEquals(getRawResponse(), dateResult,dateTest);
-
-    //String
-    Long stringResult = (Long)getStatResult("cr", "string_sd", VAL_TYPE.LONG);
-    Long stringTest = (Long)calculateStat(stringTestStart, "count");
-    assertEquals(getRawResponse(), stringResult,stringTest);
-  }  
-    
-  @Test
-  public void missingDefaultTest() throws Exception { 
-    //Int
-    long intResult = (Long)getStatResult("misr", "int_id", VAL_TYPE.LONG);
-    assertEquals(getRawResponse(), intMissing,intResult);
-
-    //Long
-    long longResult = (Long)getStatResult("misr", "long_ld", VAL_TYPE.LONG);
-    assertEquals(getRawResponse(), longMissing,longResult);
-
-    //Float
-    long floatResult = (Long)getStatResult("misr", "float_fd", VAL_TYPE.LONG);
-    assertEquals(getRawResponse(), floatMissing,floatResult);
-
-    //Double
-    long doubleResult = (Long)getStatResult("misr", "double_dd", VAL_TYPE.LONG);
-    assertEquals(getRawResponse(), doubleMissing,doubleResult);
-
-    //Date
-    long dateResult = (Long)getStatResult("misr", "date_dtd", VAL_TYPE.LONG);
-    assertEquals(getRawResponse(), dateMissing,dateResult);
-
-    //String
-    long stringResult = (Long)getStatResult("misr", "string_sd", VAL_TYPE.LONG);
-    assertEquals(getRawResponse(), stringMissing, stringResult);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f0366b94/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.java
deleted file mode 100644
index 89fe2c7..0000000
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyExpressionTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.analytics.legacy.expression;
-
-import java.time.Instant;
-import java.util.Date;
-
-import org.apache.solr.analytics.legacy.LegacyAbstractAnalyticsTest;
-import org.apache.solr.util.DateMathParser;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class LegacyExpressionTest extends LegacyAbstractAnalyticsTest {
-  private static final String fileName = "expressions.txt";
-
-  private static final int INT = 71;
-  private static final int LONG = 36;
-  private static final int FLOAT = 93;
-  private static final int DOUBLE = 49;
-  private static final int DATE = 12;
-  private static final int STRING = 28;
-  private static final int NUM_LOOPS = 100;
-
-
-  @BeforeClass
-  public static void beforeClass() throws Exception {
-    initCore("solrconfig-analytics.xml", "schema-analytics.xml");
-    h.update("<delete><query>*:*</query></delete>");
-
-    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 s = "str" + (j % STRING);
-      assertU(adoc("id", "1000" + j, "int_id", "" + i, "long_ld", "" + l, "float_fd", "" + f,
-          "double_dd", "" + d, "date_dtd", dt, "string_sd", s));
-
-      if (usually()) {
-        assertU(commit()); // to have several segments
-      }
-    }
-
-    assertU(commit());
-
-    setResponse(h.query(request(fileToStringArr(LegacyExpressionTest.class, fileName))));
-  }
-
-  @Test
-  public void addTest() throws Exception {
-    double sumResult = (Double) getStatResult("ar", "sum", VAL_TYPE.DOUBLE);
-    double uniqueResult = ((Long) getStatResult("ar", "unique", VAL_TYPE.LONG)).doubleValue();
-    double result = (Double) getStatResult("ar", "su", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), sumResult + uniqueResult, result, 0.0);
-
-    double meanResult = (Double) getStatResult("ar", "mean", VAL_TYPE.DOUBLE);
-    double medianResult = (Double) getStatResult("ar", "median", VAL_TYPE.DOUBLE);
-    double countResult = ((Long) getStatResult("ar", "count", VAL_TYPE.LONG)).doubleValue();
-    result = (Double) getStatResult("ar", "mcm", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), meanResult + countResult + medianResult, result, 0.0);
-  }
-
-  @Test
-  public void multiplyTest() throws Exception {
-    double sumResult = (Double) getStatResult("mr", "sum", VAL_TYPE.DOUBLE);
-    double uniqueResult = ((Long) getStatResult("mr", "unique", VAL_TYPE.LONG)).doubleValue();
-    double result = (Double) getStatResult("mr", "su", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), sumResult * uniqueResult, result, 0.0);
-
-    double meanResult = (Double) getStatResult("mr", "mean", VAL_TYPE.DOUBLE);
-    double medianResult = (Double) getStatResult("mr", "median", VAL_TYPE.DOUBLE);
-    double countResult = ((Long) getStatResult("mr", "count", VAL_TYPE.LONG)).doubleValue();
-    result = (Double) getStatResult("mr", "mcm", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), meanResult * countResult * medianResult, result, 0.0);
-  }
-
-  @Test
-  public void divideTest() throws Exception {
-    double sumResult = (Double) getStatResult("dr", "sum", VAL_TYPE.DOUBLE);
-    double uniqueResult = ((Long) getStatResult("dr", "unique", VAL_TYPE.LONG)).doubleValue();
-    double result = (Double) getStatResult("dr", "su", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), sumResult / uniqueResult, result, 0.0);
-
-    double meanResult = (Double) getStatResult("dr", "mean", VAL_TYPE.DOUBLE);
-    double countResult = ((Long) getStatResult("dr", "count", VAL_TYPE.LONG)).doubleValue();
-    result = (Double) getStatResult("dr", "mc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), meanResult / countResult, result, 0.0);
-  }
-
-  @Test
-  public void powerTest() throws Exception {
-    double sumResult = (Double) getStatResult("pr", "sum", VAL_TYPE.DOUBLE);
-    double uniqueResult = ((Long) getStatResult("pr", "unique", VAL_TYPE.LONG)).doubleValue();
-    double result = (Double) getStatResult("pr", "su", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), Math.pow(sumResult, uniqueResult), result, 0.0);
-
-    double meanResult = (Double) getStatResult("pr", "mean", VAL_TYPE.DOUBLE);
-    double countResult = ((Long) getStatResult("pr", "count", VAL_TYPE.LONG)).doubleValue();
-    result = (Double) getStatResult("pr", "mc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), Math.pow(meanResult, countResult), result, 0.0);
-  }
-
-  @Test
-  public void negateTest() throws Exception {
-    double sumResult = (Double) getStatResult("nr", "sum", VAL_TYPE.DOUBLE);
-    double result = (Double) getStatResult("nr", "s", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), -1 * sumResult, result, 0.0);
-
-    long countResult = ((Long) getStatResult("nr", "count", VAL_TYPE.LONG));
-    long lresult = (Long) getStatResult("nr", "c", VAL_TYPE.LONG);
-    assertEquals(getRawResponse(), -1 * countResult, lresult, 0.0);
-  }
-
-  @Test
-  public void absoluteValueTest() throws Exception {
-    double sumResult = (Double) getStatResult("avr", "sum", VAL_TYPE.DOUBLE);
-    double result = (Double) getStatResult("avr", "s", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), sumResult, result, 0.0);
-
-    long countResult = ((Long) getStatResult("avr", "count", VAL_TYPE.LONG));
-    long lresult = (Long) getStatResult("avr", "c", VAL_TYPE.LONG);
-    assertEquals(getRawResponse(), countResult, lresult, 0.0);
-  }
-
-  @Test
-  public void constantNumberTest() throws Exception {
-    int result = (Integer) getStatResult("cnr", "c8", VAL_TYPE.INTEGER);
-    assertEquals(getRawResponse(), 8, result, 0.0);
-
-    double dresult = (Double) getStatResult("cnr", "c10", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), 10.0, dresult, 0.0);
-  }
-
-  @Test
-  public void dateMathTest() throws Exception {
-    String math = (String) getStatResult("dmr", "cme", VAL_TYPE.STRING);
-    DateMathParser dateMathParser = new DateMathParser();
-    dateMathParser.setNow(new Date(Instant.parse((String) getStatResult("dmr", "median", VAL_TYPE.DATE)).toEpochMilli()));
-    String dateMath = (String) getStatResult("dmr", "dmme", VAL_TYPE.DATE);
-    assertEquals(getRawResponse(), new Date(Instant.parse(dateMath).toEpochMilli()), dateMathParser.parseMath(math));
-
-    math = (String) getStatResult("dmr", "cma", VAL_TYPE.STRING);
-    dateMathParser = new DateMathParser();
-    dateMathParser.setNow(new Date(Instant.parse((String) getStatResult("dmr", "max", VAL_TYPE.DATE)).toEpochMilli()));
-    dateMath = (String) getStatResult("dmr", "dmma", VAL_TYPE.DATE);
-    assertEquals(getRawResponse(), new Date(Instant.parse(dateMath).toEpochMilli()), dateMathParser.parseMath(math));
-  }
-
-  @Test
-  public void constantDateTest() throws Exception {
-    String date = (String) getStatResult("cdr", "cd1", VAL_TYPE.DATE);
-    String str = (String) getStatResult("cdr", "cs1", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), date, str);
-
-    date = (String) getStatResult("cdr", "cd2", VAL_TYPE.DATE);
-    str = (String) getStatResult("cdr", "cs2", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), date, str);
-  }
-
-  @Test
-  public void constantStringTest() throws Exception {
-    String str = (String) getStatResult("csr", "cs1", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), str, "this is the first");
-
-    str = (String) getStatResult("csr", "cs2", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), str, "this is the second");
-
-    str = (String) getStatResult("csr", "cs3", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), str, "this is the third");
-  }
-
-  @Test
-  public void concatenateTest() throws Exception {
-    StringBuilder builder = new StringBuilder();
-    builder.append((String) getStatResult("cr", "csmin", VAL_TYPE.STRING));
-    builder.append((String) getStatResult("cr", "min", VAL_TYPE.STRING));
-    String concat = (String) getStatResult("cr", "ccmin", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), concat, builder.toString());
-
-    builder.setLength(0);
-    builder.append((String) getStatResult("cr", "csmax", VAL_TYPE.STRING));
-    builder.append((String) getStatResult("cr", "max", VAL_TYPE.STRING));
-    concat = (String) getStatResult("cr", "ccmax", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), concat, builder.toString());
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f0366b94/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.java
deleted file mode 100644
index 85c1333..0000000
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/expression/LegacyFunctionTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.analytics.legacy.expression;
-
-
-import org.apache.solr.analytics.legacy.LegacyAbstractAnalyticsTest;
-import org.apache.solr.analytics.legacy.facet.LegacyAbstractAnalyticsFacetTest;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class LegacyFunctionTest extends LegacyAbstractAnalyticsTest {
-  static String fileName = "functions.txt";
-
-  static public final int INT = 71;
-  static public final int LONG = 36;
-  static public final int FLOAT = 93;
-  static public final int DOUBLE = 49;
-  static public final int DATE = 12;
-  static public final int STRING = 28;
-  static public final int NUM_LOOPS = 100;
-
-  @BeforeClass
-  public static void beforeClass() throws Exception {
-    initCore("solrconfig-analytics.xml","schema-analytics.xml");
-    h.update("<delete><query>*:*</query></delete>");
-    
-    for (int j = 0; j < NUM_LOOPS; ++j) {
-      int i = j%INT+1;
-      long l = j%LONG+1;
-      float f = j%FLOAT+1;
-      double d = j%DOUBLE+1;
-      double d0 = j%DOUBLE;
-      String dt = (1800+j%DATE) + "-06-30T23:59:59Z";
-      String s = "str" + (j%STRING);
-
-      double add_if = (double)i+f;
-      double add_ldf = (double)l+d+f;
-      double mult_if = (double)i*f;
-      double mult_ldf = (double)l*d*f;
-      double div_if = (double)i/f;
-      double div_ld = (double)l/d;
-      double pow_if = Math.pow(i,f);
-      double pow_ld = Math.pow(l,d);
-      int neg_i = i*-1;
-      long neg_l = l*-1;
-      String dm_2y = (1802+j%DATE) + "-06-30T23:59:59Z";
-      String dm_2m = (1800+j%DATE) + "-08-30T23:59:59Z";
-      String concat_first = "this is the first"+s;
-      String concat_second = "this is the second"+s;
-      
-      assertU(adoc(LegacyAbstractAnalyticsFacetTest.filter("id", "1000" + j, "int_id", "" + i, "long_ld", "" + l, "float_fd", "" + f, 
-            "double_dd", "" + d,  "date_dtd", dt, "string_sd", s,
-            "add_if_dd", ""+add_if, "add_ldf_dd", ""+add_ldf, "mult_if_dd", ""+mult_if, "mult_ldf_dd", ""+mult_ldf,
-            "div_if_dd", ""+div_if, "div_ld_dd", ""+div_ld, "pow_if_dd", ""+pow_if, "pow_ld_dd", ""+pow_ld,
-            "neg_id", ""+neg_i, "neg_ld", ""+neg_l, "const_8_dd", "8", "const_10_dd", "10", "dm_2y_dtd", dm_2y, "dm_2m_dtd", dm_2m,
-            "const_00_dtd", "1800-06-30T23:59:59Z", "const_04_dtd", "1804-06-30T23:59:59Z", "const_first_sd", "this is the first", "const_second_sd", "this is the second",
-            "concat_first_sd", concat_first, "concat_second_sd", concat_second, "miss_dd", ""+d0 )));
-      
-      
-      if (usually()) {
-        assertU(commit()); // to have several segments
-      }
-    }
-    
-    assertU(commit()); 
-    
-    setResponse(h.query(request(fileToStringArr(LegacyFunctionTest.class, fileName))));
-  }
-      
-  @Test
-  public void addTest() throws Exception { 
-    double result = (Double)getStatResult("ar", "sum", VAL_TYPE.DOUBLE);
-    double calculated = (Double)getStatResult("ar", "sumc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), result, calculated, 0.0);
-    // TODO checfk why asserted 2times
-    assertEquals(getRawResponse(), result, calculated, 0.0);
-
-    result = (Double)getStatResult("ar", "mean", VAL_TYPE.DOUBLE);
-    calculated = (Double)getStatResult("ar", "meanc", VAL_TYPE.DOUBLE);
-    assertTrue(result==calculated);
-    assertEquals(getRawResponse(), result, calculated, 0.0);
-  }
-  
-  @Test
-  public void multiplyTest() throws Exception { 
-    double result = (Double)getStatResult("mr", "sum", VAL_TYPE.DOUBLE);
-    double calculated = (Double)getStatResult("mr", "sumc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-    
-    result = (Double)getStatResult("mr", "mean", VAL_TYPE.DOUBLE);
-    calculated = (Double)getStatResult("mr", "meanc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-  }
-  
-  @Test
-  public void divideTest() throws Exception { 
-    Double result = (Double)getStatResult("dr", "sum", VAL_TYPE.DOUBLE);
-    Double calculated = (Double)getStatResult("dr", "sumc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-    
-    result = (Double)getStatResult("dr", "mean", VAL_TYPE.DOUBLE);
-    calculated = (Double)getStatResult("dr", "meanc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-  }
-  
-  @Test
-  public void powerTest() throws Exception { 
-    double result = (Double)getStatResult("pr", "sum", VAL_TYPE.DOUBLE);
-    double calculated = (Double)getStatResult("pr", "sumc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), result, calculated, 0.0);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-    
-    result = (Double)getStatResult("pr", "mean", VAL_TYPE.DOUBLE);
-    calculated = (Double)getStatResult("pr", "meanc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), result, calculated, 0.0);
-    assertEquals(getRawResponse(), result, calculated, 0.0);
-  }
-  
-  @Test
-  public void negateTest() throws Exception { 
-    double result = (Double)getStatResult("nr", "sum", VAL_TYPE.DOUBLE);
-    double calculated = (Double)getStatResult("nr", "sumc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-    
-    result = (Double)getStatResult("nr", "mean", VAL_TYPE.DOUBLE);
-    calculated = (Double)getStatResult("nr", "meanc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-  }
-
-  @Test 
-  public void absoluteValueTest() throws Exception {
-    double result = (Double)getStatResult("avr", "sum", VAL_TYPE.DOUBLE);
-    double calculated = (Double)getStatResult("avr", "sumc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-    
-    result = (Double)getStatResult("avr", "mean", VAL_TYPE.DOUBLE);
-    calculated = (Double)getStatResult("avr", "meanc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-  }
-  
-  @Test
-  public void constantNumberTest() throws Exception { 
-    double result = (Double)getStatResult("cnr", "sum", VAL_TYPE.DOUBLE);
-    double calculated = (Double)getStatResult("cnr", "sumc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), result, calculated, 0.0);
-    assertEquals(getRawResponse(), result, calculated, 0.0);
-    
-    result = (Double)getStatResult("cnr", "mean", VAL_TYPE.DOUBLE);
-    calculated = (Double)getStatResult("cnr", "meanc", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), result, calculated, 0.0);
-    assertEquals(getRawResponse(),  result, calculated, 0.0);
-  }
-  
-  @Test
-  public void dateMathTest() throws Exception {
-    String result = (String)getStatResult("dmr", "median", VAL_TYPE.DATE);
-    String calculated = (String)getStatResult("dmr", "medianc", VAL_TYPE.DATE);
-    assertEquals(getRawResponse(), result, calculated);
-    
-    result = (String)getStatResult("dmr", "max", VAL_TYPE.DATE);
-    calculated = (String)getStatResult("dmr", "maxc", VAL_TYPE.DATE);
-    assertEquals(getRawResponse(), result, calculated);
-  }
-  
-  @Test
-  public void constantDateTest() throws Exception { 
-    String result = (String)getStatResult("cdr", "median", VAL_TYPE.DATE);
-    String calculated = (String)getStatResult("cdr", "medianc", VAL_TYPE.DATE);
-    assertEquals(getRawResponse(), result, calculated);
-    assertEquals(getRawResponse(), result, calculated);
-    
-    result = (String)getStatResult("cdr", "max", VAL_TYPE.DATE);
-    calculated = (String)getStatResult("cdr", "maxc", VAL_TYPE.DATE);
-    assertEquals(getRawResponse(), result, calculated);
-  }
-  
-  @Test
-  public void constantStringTest() throws Exception { 
-    String result = (String)getStatResult("csr", "min", VAL_TYPE.STRING);
-    String calculated = (String)getStatResult("csr", "minc", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), result, calculated);
-    
-    result = (String)getStatResult("csr", "max", VAL_TYPE.STRING);
-    calculated = (String)getStatResult("csr", "maxc", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), result, calculated);
-  }
-  
-  @Test
-  public void concatenateTest() throws Exception { 
-    String result = (String)getStatResult("cr", "min", VAL_TYPE.STRING);
-    String calculated = (String)getStatResult("cr", "minc", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), result, calculated);
-    
-    result = (String)getStatResult("cr", "max", VAL_TYPE.STRING);
-    calculated = (String)getStatResult("cr", "maxc", VAL_TYPE.STRING);
-    assertEquals(getRawResponse(), result, calculated);
-  }
-  
-  @Test
-  public void missingTest() throws Exception { 
-    double min = (Double)getStatResult("ms", "min", VAL_TYPE.DOUBLE);
-    double max = (Double)getStatResult("ms", "max", VAL_TYPE.DOUBLE);
-    assertEquals(getRawResponse(), 48.0d, max, 0.0);
-    assertEquals(getRawResponse(), 1.0d, min, 0.0);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f0366b94/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetCloudTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetCloudTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetCloudTest.java
deleted file mode 100644
index 783177d..0000000
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetCloudTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.analytics.legacy.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.solr.analytics.legacy.LegacyAbstractAnalyticsCloudTest;
-import org.apache.solr.analytics.util.AnalyticsResponseHeadings;
-import org.apache.solr.analytics.util.MedianCalculator;
-import org.apache.solr.analytics.util.OrdinalCalculator;
-import org.apache.solr.common.util.NamedList;
-import org.junit.AfterClass;
-
-public class LegacyAbstractAnalyticsFacetCloudTest extends LegacyAbstractAnalyticsCloudTest {
-  protected static final HashMap<String,Object> defaults = new HashMap<>();
-  
-  protected String latestType = "";
-  
-  @AfterClass
-  public static void afterClassAbstractAnalysis() {
-    defaults.clear();
-  }
-  
-  @SuppressWarnings("unchecked")
-  protected <T> ArrayList<T> getValueList(NamedList<Object> response, String infoName, String facetType, String facetName, String exprName, boolean includeMissing) {
-    NamedList<NamedList<Object>> facetList = 
-        (NamedList<NamedList<Object>>)response.findRecursive(AnalyticsResponseHeadings.COMPLETED_OLD_HEADER,
-                                                             infoName,
-                                                             facetType,
-                                                             facetName);
-    
-    ArrayList<T> results = new ArrayList<>();
-    facetList.forEach( (name, expressions) -> {
-      if (!includeMissing && !name.equals("(MISSING)")) {
-        T result = (T)expressions.get(exprName);
-        if (result != null)
-          results.add(result);
-      }
-    });
-    return results;
-  }
-  
-  protected boolean responseContainsFacetValue(NamedList<Object> response, String infoName, String facetType, String facetName, String facetValue) {
-    return null != response.findRecursive(AnalyticsResponseHeadings.COMPLETED_OLD_HEADER,
-                                          infoName,
-                                          facetType,
-                                          facetName,
-                                          facetValue);
-  }
-
-
-  public static void increment(List<Long> list, int idx){
-    Long i = list.remove(idx);
-    list.add(idx, i+1);
-  }
-  
-  protected void setLatestType(String latestType) {
-    this.latestType = latestType;
-  }
-
-  @SuppressWarnings({ "unchecked", "rawtypes" })
-  public <T extends Number & Comparable<T>> ArrayList calculateFacetedNumberStat(ArrayList<ArrayList<T>> lists, String stat) {
-    ArrayList result;
-    if (stat.equals("median")) {
-      result = new ArrayList<Double>();
-      for (List<T> list : lists) {
-        result.add(MedianCalculator.getMedian(list));
-      }
-    } else if (stat.equals("mean")) {
-      result = new ArrayList<Double>();
-      for (List<T> list : lists) {
-        double d = 0;
-        for (T element : list) {
-          d += element.doubleValue();
-        }
-        result.add(d/list.size());
-      }
-    } else if (stat.equals("sum")) {
-      result = new ArrayList<Double>();
-      for (Collection<T> list : lists) {
-        double d = 0;
-        for (T element : list) {
-          d += element.doubleValue();
-        }
-        result.add(d);
-      }
-    } else if (stat.equals("sumOfSquares")) {
-      result = new ArrayList<Double>();
-      for (List<T> list : lists) {
-        double d = 0;
-        for (T element : list) {
-          d += element.doubleValue()*element.doubleValue();
-        }
-        result.add(d);
-      }
-    } else if (stat.equals("stddev")) {
-      result = new ArrayList<Double>();
-      for (List<T> list : lists) {
-        double sum = 0;
-        double sumSquares = 0;
-        for (T element : list) {
-          sum += element.doubleValue();
-          sumSquares += element.doubleValue()*element.doubleValue();
-        }
-        String res = Double.toString(Math.sqrt(sumSquares/list.size()-sum*sum/(list.size()*list.size())));
-        result.add(Double.parseDouble(res));
-      }
-    } else {
-      throw new IllegalArgumentException();
-    }
-    return result;
-  }
-
-  @SuppressWarnings({ "unchecked", "rawtypes" })
-  public <T extends Comparable<T>> ArrayList calculateFacetedStat(ArrayList<ArrayList<T>> lists, String stat) {
-    ArrayList result;
-    if (stat.contains("perc_")) {
-      result = new ArrayList<T>();
-      for (List<T> list : lists) {
-        if( list.size() == 0) continue;
-        int ord = (int) Math.ceil(Double.parseDouble(stat.substring(5))/100 * list.size()) - 1;
-        ArrayList<Integer> percs = new ArrayList<>(1);
-        percs.add(ord);
-        OrdinalCalculator.putOrdinalsInPosition(list, percs);
-        result.add(list.get(ord));
-      }
-    } else if (stat.equals("count")) {
-      result = new ArrayList<Long>();
-      for (List<T> list : lists) {
-        result.add((long)list.size());
-      }
-    } else if (stat.equals("missing")) {
-      result = new ArrayList<Long>();
-      for (ArrayList<T> list : lists) {
-        result.add(calculateMissing(list,latestType));
-      }
-    } else if (stat.equals("unique")) {
-      result = new ArrayList<Long>();
-      for (List<T> list : lists) {
-        HashSet<T> set = new HashSet<>();
-        set.addAll(list);
-        result.add((long)set.size());
-      }
-    } else if (stat.equals("max")) {
-      result = new ArrayList<T>();
-      for (List<T> list : lists) {
-        if( list.size() == 0) continue;
-        Collections.sort(list);
-        result.add(list.get(list.size()-1));
-      }
-    } else if (stat.equals("min")) {
-      result = new ArrayList<T>();
-      for (List<T> list : lists) {
-        if( list.size() == 0) continue;
-        Collections.sort((List<T>)list);
-        result.add(list.get(0));
-      }
-    } else {
-      result = null;
-    }
-    return result;
-  }
-
-  @SuppressWarnings("unchecked")
-  public <T extends Comparable<T>> Long calculateMissing(ArrayList<T> list, String type) {
-    T def = (T)defaults.get(type);
-    long miss = 0;
-    for (T element : list) {
-      if (element.compareTo(def)==0) {
-        miss++;
-      }
-    }
-    return Long.valueOf(miss);
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f0366b94/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetTest.java
deleted file mode 100644
index 68c9826..0000000
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyAbstractAnalyticsFacetTest.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.analytics.legacy.facet;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Scanner;
-
-import org.apache.lucene.util.IOUtils;
-import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.analytics.util.AnalyticsResponseHeadings;
-import org.apache.solr.analytics.util.MedianCalculator;
-import org.apache.solr.analytics.util.OrdinalCalculator;
-import org.apache.solr.request.SolrQueryRequest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-import com.google.common.collect.ObjectArrays;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-public class LegacyAbstractAnalyticsFacetTest extends SolrTestCaseJ4 {
-  protected static final HashMap<String,Object> defaults = new HashMap<>();
-  
-  protected String latestType = "";
-
-  private static Document doc;
-  private static XPathFactory xPathFact;
-  private static String rawResponse;
-
-  @BeforeClass
-  public static void beforeClassAbstractAnalysis() {
-    xPathFact = XPathFactory.newInstance();
-  }
-  
-  @AfterClass
-  public static void afterClassAbstractAnalysis() {
-    xPathFact = null;
-    doc = null;
-    rawResponse = null;
-    defaults.clear();
-  }
-
-  protected static void setResponse(String response) throws ParserConfigurationException, IOException, SAXException {
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-    factory.setNamespaceAware(true); // never forget this!
-    DocumentBuilder builder = factory.newDocumentBuilder();
-    doc = builder.parse(new InputSource(new ByteArrayInputStream(response.getBytes(StandardCharsets.UTF_8))));
-    rawResponse = response;
-  }
-
-  protected String getRawResponse() {
-    return rawResponse;
-  }
-
-  protected Node getNode(String xPath) throws XPathExpressionException {
-    return (Node)xPathFact.newXPath().compile(xPath).evaluate(doc, XPathConstants.NODE);
-  }
-  private NodeList getNodes(String n1, String n2, String n3, String element, String n4) throws XPathExpressionException {
-    // Construct the XPath expression. The form better not change or all these will fail.
-    StringBuilder sb = new StringBuilder("/response/lst[@name='"+AnalyticsResponseHeadings.COMPLETED_OLD_HEADER+"']/lst[@name='").append(n1).append("']");
-    sb.append("/lst[@name='").append(n2).append("']");
-    sb.append("/lst[@name='").append(n3).append("']");
-    sb.append("/lst[@name!='(MISSING)']");
-    sb.append("//").append(element).append("[@name='").append(n4).append("']");
-    return (NodeList)xPathFact.newXPath().compile(sb.toString()).evaluate(doc, XPathConstants.NODESET);
-
-  }
-  protected ArrayList<String> getStringList(String n1, String n2, String n3, String element, String n4)
-      throws XPathExpressionException {
-    ArrayList<String> ret = new ArrayList<>();
-    NodeList nodes = getNodes(n1, n2, n3, element, n4);
-    for (int idx = 0; idx < nodes.getLength(); ++idx) {
-      ret.add(nodes.item(idx).getTextContent());
-    }
-    return ret;
-  }
-
-  protected ArrayList<Integer> getIntegerList(String n1, String n2, String n3, String element, String n4)
-      throws XPathExpressionException {
-    ArrayList<Integer> ret = new ArrayList<>();
-    NodeList nodes = getNodes(n1, n2, n3, element, n4);
-    for (int idx = 0; idx < nodes.getLength(); ++idx) {
-      ret.add(Integer.parseInt(nodes.item(idx).getTextContent()));
-    }
-    return ret;
-  }
-  protected ArrayList<Long> getLongList(String n1, String n2, String n3, String element, String n4)
-      throws XPathExpressionException {
-    ArrayList<Long> ret = new ArrayList<>();
-    NodeList nodes = getNodes(n1, n2, n3, element, n4);
-    for (int idx = 0; idx < nodes.getLength(); ++idx) {
-      ret.add(Long.parseLong(nodes.item(idx).getTextContent()));
-    }
-    return ret;
-  }
-  protected ArrayList<Float> getFloatList(String n1, String n2, String n3, String element, String n4)
-      throws XPathExpressionException {
-    ArrayList<Float> ret = new ArrayList<>();
-    NodeList nodes = getNodes(n1, n2, n3, element, n4);
-    for (int idx = 0; idx < nodes.getLength(); ++idx) {
-      ret.add(Float.parseFloat(nodes.item(idx).getTextContent()));
-    }
-    return ret;
-  }
-
-  protected ArrayList<Double> getDoubleList(String n1, String n2, String n3, String element, String n4)
-      throws XPathExpressionException {
-    ArrayList<Double> ret = new ArrayList<>();
-    NodeList nodes = getNodes(n1, n2, n3, element, n4);
-    for (int idx = 0; idx < nodes.getLength(); ++idx) {
-      ret.add(Double.parseDouble(nodes.item(idx).getTextContent()));
-    }
-    return ret;
-  }
-
-
-  public static void increment(List<Long> list, int idx){
-    Long i = list.remove(idx);
-    list.add(idx, i+1);
-  }
-  
-  public static String[] filter(String...args){
-    List<String> l = new ArrayList<>();
-    for( int i=0; i <args.length; i+=2){
-      if( args[i+1].equals("0") || args[i+1].equals("0.0") || 
-          args[i+1].equals("1800-12-31T23:59:59Z") || args[i+1].equals("str0") ||
-          args[i+1].equals("this is the firststr0") || 
-          args[i+1].equals("this is the secondstr0") ){
-        continue;
-      }
-      l.add(args[i]);
-      l.add(args[i+1]);
-    }
-    return l.toArray(new String[0]);
-  }
-  
-  protected void setLatestType(String latestType) {
-    this.latestType = latestType;
-  }
-
-  @SuppressWarnings({ "unchecked", "rawtypes" })
-  public <T extends Number & Comparable<T>> ArrayList calculateNumberStat(ArrayList<ArrayList<T>> lists, String stat) {
-    ArrayList result;
-    if (stat.equals("median")) {
-      result = new ArrayList<Double>();
-      for (List<T> list : lists) {
-        result.add(MedianCalculator.getMedian(list));
-      }
-    } else if (stat.equals("mean")) {
-      result = new ArrayList<Double>();
-      for (List<T> list : lists) {
-        double d = 0;
-        for (T element : list) {
-          d += element.doubleValue();
-        }
-        result.add(d/list.size());
-      }
-    } else if (stat.equals("sum")) {
-      result = new ArrayList<Double>();
-      for (Collection<T> list : lists) {
-        double d = 0;
-        for (T element : list) {
-          d += element.doubleValue();
-        }
-        result.add(d);
-      }
-    } else if (stat.equals("sumOfSquares")) {
-      result = new ArrayList<Double>();
-      for (List<T> list : lists) {
-        double d = 0;
-        for (T element : list) {
-          d += element.doubleValue()*element.doubleValue();
-        }
-        result.add(d);
-      }
-    } else if (stat.equals("stddev")) {
-      result = new ArrayList<Double>();
-      for (List<T> list : lists) {
-        double sum = 0;
-        double sumSquares = 0;
-        for (T element : list) {
-          sum += element.doubleValue();
-          sumSquares += element.doubleValue()*element.doubleValue();
-        }
-        String res = Double.toString(Math.sqrt(sumSquares/list.size()-sum*sum/(list.size()*list.size())));
-        result.add(Double.parseDouble(res));
-      }
-    } else {
-      throw new IllegalArgumentException();
-    }
-    return result;
-  }
-
-  @SuppressWarnings({ "unchecked", "rawtypes" })
-  public <T extends Comparable<T>> ArrayList calculateStat(ArrayList<ArrayList<T>> lists, String stat) {
-    ArrayList result;
-    if (stat.contains("perc_")) {
-      result = new ArrayList<T>();
-      for (List<T> list : lists) {
-        if( list.size() == 0) continue;
-        int ord = (int) Math.ceil(Double.parseDouble(stat.substring(5))/100 * list.size()) - 1;
-        ArrayList<Integer> percs = new ArrayList<>(1);
-        percs.add(ord);
-        OrdinalCalculator.putOrdinalsInPosition(list, percs);
-        result.add(list.get(ord));
-      }
-    } else if (stat.equals("count")) {
-      result = new ArrayList<Long>();
-      for (List<T> list : lists) {
-        //if( list.size() == 0) continue;
-        result.add((long)list.size());
-      }
-    } else if (stat.equals("missing")) {
-      result = new ArrayList<Long>();
-      for (ArrayList<T> list : lists) {
-        if( list.size() == 0) continue;
-        result.add(calculateMissing(list,latestType));
-      }
-    } else if (stat.equals("unique")) {
-      result = new ArrayList<Long>();
-      for (List<T> list : lists) {
-        HashSet<T> set = new HashSet<>();
-        set.addAll(list);
-        result.add((long)set.size());
-      }
-    } else if (stat.equals("max")) {
-      result = new ArrayList<T>();
-      for (List<T> list : lists) {
-        if( list.size() == 0) continue;
-        Collections.sort(list);
-        result.add(list.get(list.size()-1));
-      }
-    } else if (stat.equals("min")) {
-      result = new ArrayList<T>();
-      for (List<T> list : lists) {
-        if( list.size() == 0) continue;
-        Collections.sort((List<T>)list);
-        result.add(list.get(0));
-      }
-    } else {
-      result = null;
-    }
-    return result;
-  }
-
-  @SuppressWarnings("unchecked")
-  public <T extends Comparable<T>> Long calculateMissing(ArrayList<T> list, String type) {
-    T def = (T)defaults.get(type);
-    long miss = 0;
-    for (T element : list) {
-      if (element.compareTo(def)==0) {
-        miss++;
-      }
-    }
-    return Long.valueOf(miss);
-  }
-  
-  public static SolrQueryRequest request(String...args){
-    return SolrTestCaseJ4.req( ObjectArrays.concat(BASEPARMS, args,String.class) );
-  }
-  
-  public static final String[] BASEPARMS = new String[]{ "q", "*:*", "indent", "true", "olap", "true", "rows", "0" };
-
-  
-  public static String[] fileToStringArr(Class<?> clazz, String fileName) throws FileNotFoundException {
-    InputStream in = clazz.getResourceAsStream("/solr/analytics/legacy/" + fileName);
-    if (in == null) throw new FileNotFoundException("Resource not found: " + fileName);
-    Scanner file = new Scanner(in, "UTF-8");
-    try { 
-      ArrayList<String> strList = new ArrayList<>();
-      while (file.hasNextLine()) {
-        String line = file.nextLine();
-        if (line.length()<2) {
-          continue;
-        }
-        int commentStart = line.indexOf("//");
-        if (commentStart >= 0) {
-          line = line.substring(0,commentStart);
-        }
-        String[] param = line.split("=");
-        if (param.length != 2) {
-          continue;
-        }
-        strList.add(param[0]);
-        strList.add(param[1]);
-      }
-      return strList.toArray(new String[0]);
-    } finally {
-      IOUtils.closeWhileHandlingException(file, in);
-    }
-  }
-  
-  protected void removeNodes(String xPath, List<Double> string) throws XPathExpressionException {
-    NodeList missingNodes = getNodes(xPath);
-    List<Double> result = new ArrayList<Double>();
-    for (int idx = 0; idx < missingNodes.getLength(); ++idx) {
-      result.add(Double.parseDouble(missingNodes.item(idx).getTextContent()));
-    }
-    string.removeAll(result);
-  }
-
-  protected NodeList getNodes(String xPath) throws XPathExpressionException {
-    StringBuilder sb = new StringBuilder(xPath);
-    return (NodeList) xPathFact.newXPath().compile(sb.toString()).evaluate(doc, XPathConstants.NODESET);
-  }
-  
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f0366b94/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFacetSortingTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFacetSortingTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFacetSortingTest.java
deleted file mode 100644
index d89c713..0000000
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFacetSortingTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.analytics.legacy.facet;
-
-import org.apache.solr.analytics.legacy.LegacyAbstractAnalyticsTest;
-import org.apache.solr.analytics.legacy.expression.LegacyExpressionTest;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class LegacyFacetSortingTest extends LegacyAbstractAnalyticsTest {
-  private static String fileName = "facetSorting.txt";
-
-  @BeforeClass
-  public static void beforeClass() throws Exception {
-    initCore("solrconfig-analytics.xml", "schema-analytics.xml");
-    h.update("<delete><query>*:*</query></delete>");
-
-    // The data set below is so generated that in bucket corresponding fieldFacet B, double_dd column has null values 
-    // and in bucket C corresponding to fieldFacet C has null values for column long_ld. 
-    // FieldFaceting occurs on string_sd field
-    assertU(adoc("id", "1001", "string_sd", "A", "double_dd", "" + 3, "long_ld", "" + 1));
-    assertU(adoc("id", "1002", "string_sd", "A", "double_dd", "" + 25, "long_ld", "" + 2));
-    assertU(adoc("id", "1003", "string_sd", "B", "long_ld", "" + 3));
-    assertU(adoc("id", "1004", "string_sd", "B", "long_ld", "" + 4));
-    assertU(adoc("id", "1005", "string_sd", "C",                       "double_dd", "" + 17));
-    
-    assertU(commit());
-    String response = h.query(request(fileToStringArr(LegacyExpressionTest.class, fileName)));
-    setResponse(response);
-  }
-
-  @Test
-  public void addTest() throws Exception {
-    Double minResult = (Double) getStatResult("ar", "min", VAL_TYPE.DOUBLE);
-    Long maxResult = (Long) getStatResult("ar", "max", VAL_TYPE.LONG);
-    assertEquals(Double.valueOf(minResult), Double.valueOf(3.0));
-    assertEquals(Long.valueOf(maxResult),Long.valueOf(4));
-  }
-}