fix issue IOTDB-2, separate UTs and ITs

grafana/pom.xml

@@ -42,6 +42,9 @@
         <start-class>org.apache.iotdb.web.grafana.TsfileWebDemoApplication</start-class>
         <spring-boot.version>1.5.4.RELEASE</spring-boot.version>
         <spring.version>4.3.9.RELEASE</spring.version>
+        <grafana.test.skip>false</grafana.test.skip>
+        <grafana.it.skip>${grafana.test.skip}</grafana.it.skip>
+        <grafana.ut.skip>${grafana.test.skip}</grafana.ut.skip>
     </properties>
     <!-- Import the dependency-management information from the spring-boot poms -->
     <dependencyManagement>
@@ -166,6 +169,33 @@
                         </execution>
                     </executions>
                 </plugin>
+                <!--using `mvn test` to run UT, `mvn verify` to run ITs
+                    Reference: https://antoniogoncalves.org/2012/12/13/lets-turn-integration-tests-with-maven-to-a-first-class-citizen/-->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <skipTests>${grafana.ut.skip}</skipTests>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>run-integration-tests</id>
+                            <phase>integration-test</phase>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <skipTests>${grafana.test.skip}</skipTests>
+                        <skipITs>${grafana.it.skip}</skipITs>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -187,4 +217,20 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>skipTsfileTests</id>
+            <activation>
+                <property>
+                    <name>skipTests</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <grafana.test.skip>true</grafana.test.skip>
+                <grafana.ut.skip>true</grafana.ut.skip>
+                <grafana.it.skip>true</grafana.it.skip>
+            </properties>
+        </profile>
+    </profiles>
 </project>

iotdb-cli/pom.xml

@@ -32,9 +32,11 @@
     <name>IoTDB Cli</name>
     <description>A Client tool.</description>
     <properties>
-        <cli.test.skip>false</cli.test.skip>
         <common.cli.version>1.3.1</common.cli.version>
         <jline.version>2.14.5</jline.version>
+        <cli.test.skip>false</cli.test.skip>
+        <cli.it.skip>${cli.test.skip}</cli.it.skip>
+        <cli.ut.skip>${cli.test.skip}</cli.ut.skip>
     </properties>
     <dependencies>
         <dependency>
@@ -97,13 +99,49 @@
                     <outputDirectory>${project.basedir}/cli/lib</outputDirectory>
                 </configuration>
             </plugin>
+            <!--using `mvn test` to run UT, `mvn verify` to run ITs
+            Reference: https://antoniogoncalves.org/2012/12/13/lets-turn-integration-tests-with-maven-to-a-first-class-citizen/-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>${cli.ut.skip}</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>run-integration-tests</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <skipTests>${cli.test.skip}</skipTests>
+                    <skipITs>${cli.it.skip}</skipITs>
                 </configuration>
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>skipCliTests</id>
+            <activation>
+                <property>
+                    <name>skipTests</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <cli.test.skip>true</cli.test.skip>
+                <cli.ut.skip>true</cli.ut.skip>
+                <cli.it.skip>true</cli.it.skip>
+            </properties>
+        </profile>
+    </profiles>
 </project>

iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientTest.java → 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;

iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptTest.java → 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();

iotdb/pom.xml

@@ -34,8 +34,8 @@
         <antlr3.version>3.5.2</antlr3.version>
         <common.lang3.version>3.8.1</common.lang3.version>
         <iotdb.test.skip>false</iotdb.test.skip>
-        <it.test.includes>**/*Test.java</it.test.includes>
-        <it.test.excludes>**/NoTest.java</it.test.excludes>
+        <iotdb.it.skip>${iotdb.test.skip}</iotdb.it.skip>
+        <iotdb.ut.skip>${iotdb.test.skip}</iotdb.ut.skip>
     </properties>
     <dependencies>
         <dependency>
@@ -164,18 +164,31 @@
                     <outputDirectory>${project.basedir}/iotdb/lib</outputDirectory>
                 </configuration>
             </plugin>
+            <!--using `mvn test` to run UT, `mvn verify` to run ITs
+                        Reference: https://antoniogoncalves.org/2012/12/13/lets-turn-integration-tests-with-maven-to-a-first-class-citizen/-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <runOrder>alphabetical</runOrder>
+                    <skipTests>${iotdb.ut.skip}</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>run-integration-tests</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
                     <skipTests>${iotdb.test.skip}</skipTests>
-                    <excludes>
-                        <exclude>${it.test.excludes}</exclude>
-                    </excludes>
-                    <includes>
-                        <include>${it.test.includes}</include>
-                    </includes>
+                    <skipITs>${iotdb.it.skip}</skipITs>
                 </configuration>
             </plugin>
             <!-- Might require this in Eclipse -->
@@ -199,4 +212,20 @@
 </plugin-->
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>skipTsfileTests</id>
+            <activation>
+                <property>
+                    <name>skipTests</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <iotdb.test.skip>true</iotdb.test.skip>
+                <iotdb.ut.skip>true</iotdb.ut.skip>
+                <iotdb.it.skip>true</iotdb.it.skip>
+            </properties>
+        </profile>
+    </profiles>
 </project>

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationTest.java → 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();

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteTest.java → 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;
 

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonTest.java → 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;
 

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorTest.java → 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();

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataTest.java → 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;
 

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitTest.java → 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;
 

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchTest.java → 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;
 

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesTest.java → 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;
 

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryTest.java → 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();

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderTest.java → 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;
 

iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneTest.java → 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",};

jdbc/pom.xml

@@ -33,6 +33,8 @@
     <description>A jdbc driver for a time series database, IoTDB, which uses TsFile as its storage format on disk.</description>
     <properties>
         <jdbc.test.skip>false</jdbc.test.skip>
+        <jdbc.it.skip>${jdbc.test.skip}</jdbc.it.skip>
+        <jdbc.ut.skip>${jdbc.test.skip}</jdbc.ut.skip>
     </properties>
     <dependencies>
         <dependency>
@@ -68,11 +70,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <!--using `mvn test` to run UT, `mvn verify` to run ITs
+            Reference: https://antoniogoncalves.org/2012/12/13/lets-turn-integration-tests-with-maven-to-a-first-class-citizen/-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>${jdbc.ut.skip}</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>run-integration-tests</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <skipTests>${jdbc.test.skip}</skipTests>
+                    <skipITs>${jdbc.it.skip}</skipITs>
                 </configuration>
             </plugin>
         </plugins>
@@ -116,5 +138,19 @@
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>skipTsfileTests</id>
+            <activation>
+                <property>
+                    <name>skipTests</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <jdbc.test.skip>true</jdbc.test.skip>
+                <jdbc.ut.skip>true</jdbc.ut.skip>
+                <jdbc.it.skip>true</jdbc.it.skip>
+            </properties>
+        </profile>
     </profiles>
 </project>