diff --git a/grafana/pom.xml b/grafana/pom.xml index 2e295c87fe30..f6dcf9394572 100644 --- a/grafana/pom.xml +++ b/grafana/pom.xml @@ -42,6 +42,9 @@ org.apache.iotdb.web.grafana.TsfileWebDemoApplication 1.5.4.RELEASE 4.3.9.RELEASE + false + ${grafana.test.skip} + ${grafana.test.skip} @@ -166,6 +169,33 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + + ${grafana.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + + + ${grafana.test.skip} + ${grafana.it.skip} + + @@ -187,4 +217,20 @@ + + + skipTsfileTests + + + skipTests + true + + + + true + true + true + + + diff --git a/iotdb-cli/pom.xml b/iotdb-cli/pom.xml index 6a159bb558fb..69acaa932299 100644 --- a/iotdb-cli/pom.xml +++ b/iotdb-cli/pom.xml @@ -32,9 +32,11 @@ IoTDB Cli A Client tool. - false 1.3.1 2.14.5 + false + ${cli.test.skip} + ${cli.test.skip} @@ -97,13 +99,49 @@ ${project.basedir}/cli/lib + org.apache.maven.plugins maven-surefire-plugin + + ${cli.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + ${cli.test.skip} + ${cli.it.skip} + + + skipCliTests + + + skipTests + true + + + + true + true + true + + + diff --git a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientTest.java b/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java similarity index 99% rename from iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientTest.java rename to iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java index c459c43efe6f..3876ea1269f4 100644 --- a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientTest.java +++ b/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java @@ -38,7 +38,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -public class AbstractClientTest { +public class AbstractClientIT { @Mock private IoTDBConnection connection; diff --git a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptTest.java b/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java similarity index 99% rename from iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptTest.java rename to iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java index 200a059995a8..31da016b6620 100644 --- a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptTest.java +++ b/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java @@ -31,7 +31,7 @@ import org.junit.Before; import org.junit.Test; -public class StartClientScriptTest { +public class StartClientScriptIT { @Before public void setUp() throws Exception { @@ -43,6 +43,7 @@ public void tearDown() throws Exception { @Test public void test() throws IOException, InterruptedException { + String os = System.getProperty("os.name").toLowerCase(); if (os.startsWith("windows")) { testStartClientOnWindows(); diff --git a/iotdb/pom.xml b/iotdb/pom.xml index 914c540a5a53..aeaea988338e 100644 --- a/iotdb/pom.xml +++ b/iotdb/pom.xml @@ -34,8 +34,8 @@ 3.5.2 3.8.1 false - **/*Test.java - **/NoTest.java + ${iotdb.test.skip} + ${iotdb.test.skip} @@ -164,18 +164,31 @@ ${project.basedir}/iotdb/lib + org.apache.maven.plugins maven-surefire-plugin - alphabetical + ${iotdb.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + + ${iotdb.test.skip} - - ${it.test.excludes} - - - ${it.test.includes} - + ${iotdb.it.skip} @@ -199,4 +212,20 @@ + + + skipTsfileTests + + + skipTests + true + + + + true + true + true + + + diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java similarity index 99% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java index dce857fd76ac..331524cbadc8 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java @@ -38,13 +38,13 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBAuthorizationTest { +public class IoTDBAuthorizationIT { private IoTDB deamon; public static void main(String[] args) throws Exception { for (int i = 0; i < 10; i++) { - IoTDBAuthorizationTest test = new IoTDBAuthorizationTest(); + IoTDBAuthorizationIT test = new IoTDBAuthorizationIT(); test.setUp(); test.authPerformanceTest(); test.tearDown(); diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java similarity index 99% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java index 0e1983736788..7ca7b745afb0 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java @@ -38,7 +38,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBCompleteTest { +public class IoTDBCompleteIT { private IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java similarity index 99% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java index fc5022874d0a..d3157aa94269 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java @@ -46,7 +46,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBDaemonTest { +public class IoTDBDaemonIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java similarity index 99% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java index 1cefcec37a4a..5157af21efbe 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java @@ -51,7 +51,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBEngineTimeGeneratorTest { +public class IoTDBEngineTimeGeneratorIT { private static IoTDB daemon; private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig(); diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java similarity index 97% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java index 981b43625729..04b6d532d3cd 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java @@ -42,7 +42,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBLargeDataTest { +public class IoTDBLargeDataIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java similarity index 99% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java index e5d64d18cc5d..e2b4c90ef8dd 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java @@ -41,7 +41,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBLimitSlimitTest { +public class IoTDBLimitSlimitIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java similarity index 99% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java index 3eee80e6baae..e294f143a20e 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java @@ -42,7 +42,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBMetadataFetchTest { +public class IoTDBMetadataFetchIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java similarity index 97% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java index 586327b84e2f..ffa118ca5481 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java @@ -42,7 +42,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBMultiSeriesTest { +public class IoTDBMultiSeriesIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java similarity index 99% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java index 3bab09fa6f37..faf57fdc08c4 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java @@ -51,7 +51,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. In this test case, no unseq insert data. */ -public class IoTDBSequenceDataQueryTest { +public class IoTDBSequenceDataQueryIT { private static IoTDB daemon; private static TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig(); diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java similarity index 99% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java index 7f4a9c2c7014..aee2b8978e66 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java @@ -50,7 +50,7 @@ * Notice that, all test begins with "IoTDB" is integration test. All test which will start the IoTDB server should be * defined as integration test. */ -public class IoTDBSeriesReaderTest { +public class IoTDBSeriesReaderIT { private static IoTDB deamon; diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneTest.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java similarity index 99% rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneTest.java rename to iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java index a4f32b14c7d2..88d93d2b57de 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java @@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.Test; -public class IoTDBTimeZoneTest { +public class IoTDBTimeZoneIT { private static String[] insertSqls = new String[]{"SET STORAGE GROUP TO root.timezone", "CREATE TIMESERIES root.timezone.tz1 WITH DATATYPE = INT32, ENCODING = PLAIN",}; diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 1c9f2e7a804b..800591fbfe31 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -33,6 +33,8 @@ A jdbc driver for a time series database, IoTDB, which uses TsFile as its storage format on disk. false + ${jdbc.test.skip} + ${jdbc.test.skip} @@ -68,11 +70,31 @@ + org.apache.maven.plugins maven-surefire-plugin + + ${jdbc.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + ${jdbc.test.skip} + ${jdbc.it.skip} @@ -116,5 +138,19 @@ + + skipTsfileTests + + + skipTests + true + + + + true + true + true + + diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml index 132e00fb59e4..038b953c6052 100644 --- a/service-rpc/pom.xml +++ b/service-rpc/pom.xml @@ -31,12 +31,48 @@ service-rpc Service-rpc RPC framework for client and server. + + false + ${rpc.test.skip} + ${rpc.test.skip} + org.apache.thrift libthrift + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${rpc.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + + + ${rpc.test.skip} + ${rpc.it.skip} + + + + only-eclipse @@ -91,5 +127,19 @@ + + skipTsfileTests + + + skipTests + true + + + + true + true + true + + diff --git a/tsfile/pom.xml b/tsfile/pom.xml index ba1c9393b5dc..386dd77189c0 100644 --- a/tsfile/pom.xml +++ b/tsfile/pom.xml @@ -34,6 +34,8 @@ https://github.com/thulab/iotdb/tree/master/tsfile false + ${tsfile.test.skip} + ${tsfile.test.skip} @@ -65,12 +67,31 @@ + org.apache.maven.plugins maven-surefire-plugin - -Xmx1024m + ${tsfile.ut.skip} + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + integration-test + + integration-test + verify + + + + ${tsfile.test.skip} + ${tsfile.it.skip} @@ -95,4 +116,20 @@ + + + skipTsfileTests + + + skipTests + true + + + + true + true + true + + +