Move more things

Original commit: elastic/x-pack-elasticsearch@cadac70bf9
This commit is contained in:
Nik Everett 2017-06-29 09:48:14 -04:00
parent 6e971cde96
commit 2a272446a4
8 changed files with 28 additions and 8 deletions

View File

@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.sql.jdbc.query;
package org.elasticsearch.xpack.sql.jdbc.compare;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
@ -29,7 +29,7 @@ import java.util.Map;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonMap;
import static org.elasticsearch.xpack.sql.jdbc.query.JdbcAssert.assertResultSets;
import static org.elasticsearch.xpack.sql.jdbc.compare.JdbcAssert.assertResultSets;
/**
* Compares Elasticsearch's JDBC driver to H2.

View File

@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.sql.jdbc.query;
package org.elasticsearch.xpack.sql.jdbc.compare;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;

View File

@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.sql.jdbc.query;
package org.elasticsearch.xpack.sql.jdbc.compare;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;

View File

@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.sql.jdbc.query;
package org.elasticsearch.xpack.sql.jdbc.compare;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;

View File

@ -0,0 +1,10 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
/**
* Tests comparing our jdbc client to H2's jdbc client.
*/
package org.elasticsearch.xpack.sql.jdbc.compare;

View File

@ -21,7 +21,7 @@ import java.util.Locale;
import java.util.Map;
import static java.lang.String.format;
import static org.elasticsearch.xpack.sql.jdbc.query.JdbcAssert.assertResultSets;
import static org.elasticsearch.xpack.sql.jdbc.compare.JdbcAssert.assertResultSets;
public abstract class CompareToH2BaseTestCase extends ESTestCase {
// NOCOMMIT subclasses should probably all be integration tests running against a running Elasticsearch

View File

@ -11,14 +11,14 @@ import java.util.function.Supplier;
import org.elasticsearch.common.CheckedSupplier;
import org.elasticsearch.xpack.sql.jdbc.JdbcTemplate;
import org.elasticsearch.xpack.sql.jdbc.compare.FilterIT;
import org.elasticsearch.xpack.sql.jdbc.compare.SelectIT;
import org.elasticsearch.xpack.sql.jdbc.integration.query.function.aggregate.AggSpecTests;
import org.elasticsearch.xpack.sql.jdbc.integration.query.function.scalar.datetime.DateTimeSpecTests;
import org.elasticsearch.xpack.sql.jdbc.integration.query.function.scalar.math.MathSpecTests;
import org.elasticsearch.xpack.sql.jdbc.integration.util.EsDataLoader;
import org.elasticsearch.xpack.sql.jdbc.integration.util.EsJdbcServer;
import org.elasticsearch.xpack.sql.jdbc.integration.util.H2;
import org.elasticsearch.xpack.sql.jdbc.query.FilterIT;
import org.elasticsearch.xpack.sql.jdbc.query.SelectIT;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.runner.RunWith;

View File

@ -0,0 +1,10 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
/**
* Tests for the Elasticsearch jdbc client.
*/
package org.elasticsearch.xpack.sql.jdbc;