This is an automated email from the ASF dual-hosted git repository. ericpai pushed a commit to branch bugfix/bad-regexp in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 69484be3c1b61cf088c03dbaca872768ac80c5f0 Author: Eric Pai <[email protected]> AuthorDate: Sun Oct 16 18:05:12 2022 +0800 Refactor IT classes and packages --- integration-test/checkstyle.xml | 8 ++- integration-test/import-control.xml | 81 +++++++++++++++------- .../{ => it}/IoTDBClusterPartitionIT.java | 2 +- .../confignode/{ => it}/IoTDBConfigNodeIT.java | 2 +- .../{ => it}/IoTDBConfigNodeSnapshotIT.java | 2 +- .../org/apache/iotdb/db/it/IoTDBFilterNullIT.java | 3 + .../it/aggregation/IoTDBAggregationByLevelIT.java | 3 + .../it/aggregation/IoTDBAggregationDeleteIT.java | 3 + .../aggregation/IoTDBAggregationScanOrderIT.java | 3 + .../aggregation/IoTDBAggregationSmallDataIT.java | 3 + .../db/it/aggregation/IoTDBTagAggregationIT.java | 3 + .../aligned/IoTDBAggregationWithDeletion2IT.java | 1 + .../it/aligned/IoTDBAggregationWithDeletionIT.java | 1 + .../db/it/aligned/IoTDBAlignedLastQuery2IT.java | 1 + .../db/it/aligned/IoTDBAlignedLastQuery3IT.java | 1 + .../db/it/aligned/IoTDBAlignedLastQueryIT.java | 1 + .../db/it/aligned/IoTDBAlignedSeriesQuery2IT.java | 1 + .../db/it/aligned/IoTDBAlignedSeriesQuery3IT.java | 1 + .../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 1 + .../IoTDBAlignedSeriesQueryWithDeletionIT.java | 1 + .../db/it/aligned/IoTDBGroupByLevelQueryIT.java | 1 + ...GroupByQueryWithValueFilterWithDeletion2IT.java | 1 + ...BGroupByQueryWithValueFilterWithDeletionIT.java | 1 + ...upByQueryWithoutValueFilterWithDeletion2IT.java | 1 + ...oupByQueryWithoutValueFilterWithDeletionIT.java | 1 + .../it/aligned/IoTDBLastQueryWithDeletion2IT.java | 1 + .../it/aligned/IoTDBLastQueryWithDeletionIT.java | 1 + .../aligned/IoTDBLastQueryWithoutLastCache2IT.java | 1 + .../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 1 + ...DBLastQueryWithoutLastCacheWithDeletion2IT.java | 1 + ...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 1 + ...BRawQueryWithoutValueFilterWithDeletion2IT.java | 1 + ...DBRawQueryWithoutValueFilterWithDeletionIT.java | 1 + .../db/it/{aligned => utils}/AlignedWriteUtil.java | 2 +- .../db/it/withoutNull/IoTDBWithoutAllNullIT.java | 3 + .../db/it/withoutNull/IoTDBWithoutAnyNullIT.java | 3 + .../withoutNull/IoTDBWithoutNullAllFilterIT.java | 3 + .../withoutNull/IoTDBWithoutNullAnyFilterIT.java | 3 + .../{ => it}/IoTDBSessionAlignedInsertIT.java | 4 +- .../session/{ => it}/IoTDBSessionComplexIT.java | 4 +- .../{ => it}/IoTDBSessionDisableMemControlIT.java | 4 +- .../session/{ => it}/IoTDBSessionInsertNulIT.java | 4 +- .../session/{ => it}/IoTDBSessionSimpleIT.java | 4 +- .../{ => it}/IoTDBSessionSyntaxConventionIT.java | 4 +- .../{SessionTest.java => it/SessionIT.java} | 9 ++- 45 files changed, 145 insertions(+), 37 deletions(-) diff --git a/integration-test/checkstyle.xml b/integration-test/checkstyle.xml index e6d30c1bd3..0375e5dabe 100644 --- a/integration-test/checkstyle.xml +++ b/integration-test/checkstyle.xml @@ -25,7 +25,7 @@ <property name="severity" value="error"/> <property name="fileExtensions" value="java"/> <module name="BeforeExecutionExclusionFileFilter"> - <property name="fileNamePattern" value="(^.*([\\/]src[\\/]main|[\\/]src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]iotdb[\\/]db[\\/]it[\\/]env)[\\/].*$)|(^.*([\\/]src[\\/]main|[\\/]src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]iotdb[\\/]sessionIT|)[\\/].*$)"/> + <property name="fileNamePattern" value="^.*([\\/]src[\\/]main|[\\/]src[\\/]test[\\/]java[\\/]org[\\/]apache[\\/]iotdb[\\/]db[\\/]it[\\/](env|utils))[\\/].*$"/> </module> <module name="TreeWalker"> <module name="ImportControl"> @@ -38,5 +38,11 @@ <property name="ignoreComments" value="true"/> <property name="message" value="Statement::getResultSet is not allowed to use in integration test, please use the return value of Statement::executeQuery instead."/> </module> + <module name="Regexp"> + <property name="format" value="@RunWith\(IoTDBTestRunner\.class\)"/> + <property name="ignoreComments" value="true"/> + <property name="illegalPattern" value="false" /> + <property name="message" value="Test cases should run with IoTDBTestRunner."/> + </module> </module> </module> diff --git a/integration-test/import-control.xml b/integration-test/import-control.xml index b0c7d372ee..6d5016bc73 100644 --- a/integration-test/import-control.xml +++ b/integration-test/import-control.xml @@ -18,36 +18,69 @@ specific language governing permissions and limitations under the License. --> -<import-control pkg="org.apache.iotdb.db.it"> +<import-control pkg="org.apache.iotdb"> <disallow class="java.sql.DriverManager"/> <disallow class="javax.sql.DataSource"/> - <disallow pkg="org.apache.iotdb.jdbc.*"/> - <allow pkg="java.util"/> - <allow pkg="java.sql"/> - <allow pkg="java.io"/> - <allow pkg="java.math"/> - <allow pkg="java.text"/> - <allow class="java.nio.file.Files"/> + <allow class="java.security.SecureRandom" /> <allow pkg="org\.junit.*" regex="true"/> + <allow pkg="java.io" /> + <allow pkg="java.util" /> + <allow pkg="java.math" /> + <allow pkg="java.sql" /> <allow pkg="org\.apache\.iotdb\.itbase" regex="true"/> <allow pkg="org\.apache\.iotdb\.it.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.db\.it\.utils\.TestUtils.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.db\.constant\.TestConstant.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.common\.rpc\.thrift.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.confignode\.rpc\.thrift.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.db\.client.*" regex="true"/> <allow pkg="org\.apache\.iotdb\.rpc.*" regex="true"/> <allow pkg="org\.apache\.commons\.lang3.*" regex="true"/> - <allow pkg="org\.apache\.thrift.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.commons\.client\.sync.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.commons\.auth\.entity.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.commons\.conf.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.db\.qp\.logical\.sys.*" regex="true"/> - <allow pkg="org\.apache\.iotdb\.db\.mpp\.common\.header.*" regex="true" /> - <allow pkg="org\.apache\.iotdb\.tsfile\.exception\.write.*" regex="true" /> - <allow pkg="org\.apache\.iotdb\.tsfile\.file\.metadata.*" regex="true" /> - <allow pkg="org\.apache\.iotdb\.tsfile\.read.*" regex="true" /> - <allow pkg="org\.apache\.iotdb\.tsfile\.utils.*" regex="true" /> - <allow pkg="org\.apache\.iotdb\.tsfile\.write.*" regex="true" /> <allow pkg="org\.slf4j.*" regex="true" /> + <subpackage name="db.it"> + <disallow pkg="org.apache.iotdb.jdbc.*"/> + <allow pkg="java.text"/> + <allow class="java.nio.file.Files"/> + <allow pkg="org.apache.iotdb.db.it.utils" /> + <allow pkg="org\.apache\.iotdb\.db\.it\.utils\.TestUtils.*" regex="true"/> + <allow pkg="org\.apache\.iotdb\.db\.constant\.TestConstant.*" regex="true"/> + <allow pkg="org\.apache\.iotdb\.db\.client.*" regex="true"/> + <allow pkg="org\.apache\.iotdb\.db\.mpp\.common\.header.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.tsfile\.exception\.write.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.tsfile\.file\.metadata.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.tsfile\.read.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.tsfile\.utils.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.tsfile\.write.*" regex="true" /> + </subpackage> + <subpackage name="confignode.it"> + <allow class="java.nio.ByteBuffer" /> + <allow class="org.apache.iotdb.commons.path.PartialPath" /> + <allow class="org.apache.iotdb.commons.path.PathPatternTree" /> + <allow class="org.apache.iotdb.commons.path.PathDeserializeUtil" /> + <allow class="org.apache.iotdb.tsfile.utils.PublicBAOS" /> + <allow class="org.apache.iotdb.commons.exception.IllegalPathException" /> + <allow class="org.apache.commons.codec.digest.DigestUtils" /> + <allow class="org.apache.iotdb.commons.trigger.service.TriggerExecutableManager" /> + <allow class="org.apache.iotdb.commons.trigger.TriggerInformation" /> + <allow pkg="org\.apache\.iotdb\.common\.rpc\.thrift.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.confignode\.rpc\.thrift.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.commons\.client\.sync.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.commons\.cluster.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.commons\.auth\.entity.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.commons\.conf.*" regex="true" /> + <allow pkg="org\.apache\.thrift.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.db\.qp\.logical\.sys.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.trigger\.api\.enums.*" regex="true" /> + </subpackage> + <subpackage name="session.it"> + <allow class="org.apache.iotdb.commons.conf.IoTDBConstant" /> + <allow class="org.apache.iotdb.session.ISession" /> + <allow class="org.apache.iotdb.session.SessionDataSet" /> + <allow class="org.apache.iotdb.db.conf.IoTDBDescriptor" /> + <allow class="org.apache.iotdb.db.conf.OperationType" /> + <allow class="org.apache.iotdb.db.engine.trigger.service.TriggerRegistrationService" /> + <allow class="org.apache.iotdb.db.exception.TriggerManagementException" /> + <allow class="org.apache.iotdb.tsfile.common.constant.TsFileConstant" /> + <allow pkg="org\.apache\.iotdb\.tsfile\.write.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.tsfile\.read.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.tsfile\.utils.*" regex="true" /> + <allow pkg="org\.apache\.iotdb\.tsfile\.file\.metadata.*" regex="true" /> + <allow pkg="org.apache.iotdb.db.metadata.idtable.trigger_example" /> + <allow pkg="org.apache.iotdb.session.template" /> + </subpackage> </import-control> diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBClusterPartitionIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterPartitionIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBClusterPartitionIT.java rename to integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterPartitionIT.java index cb73ebeeb0..ffd05278b8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBClusterPartitionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterPartitionIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.confignode; +package org.apache.iotdb.confignode.it; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBConfigNodeIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBConfigNodeIT.java rename to integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeIT.java index aba7da3fcd..947b104cf6 100644 --- a/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBConfigNodeIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.confignode; +package org.apache.iotdb.confignode.it; import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation; import org.apache.iotdb.common.rpc.thrift.TDataNodeConfiguration; diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBConfigNodeSnapshotIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBConfigNodeSnapshotIT.java rename to integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java index 07e999db7d..58b2f60b92 100644 --- a/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBConfigNodeSnapshotIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.confignode; +package org.apache.iotdb.confignode.it; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java index 173b181d47..f4d650e885 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java @@ -19,12 +19,14 @@ package org.apache.iotdb.db.it; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import java.sql.Connection; import java.sql.ResultSet; @@ -33,6 +35,7 @@ import java.sql.Statement; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +@RunWith(IoTDBTestRunner.class) @Category(ClusterIT.class) // TODO After old StandAlone remove public class IoTDBFilterNullIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationByLevelIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationByLevelIT.java index 54c657a8ec..b1d07581ff 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationByLevelIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationByLevelIT.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.it.aggregation; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; @@ -28,6 +29,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import java.sql.Connection; import java.sql.ResultSet; @@ -43,6 +45,7 @@ import static org.apache.iotdb.itbase.constant.TestConstant.minTime; import static org.apache.iotdb.itbase.constant.TestConstant.sum; import static org.junit.Assert.fail; +@RunWith(IoTDBTestRunner.class) @Category({LocalStandaloneIT.class, ClusterIT.class}) public class IoTDBAggregationByLevelIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationDeleteIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationDeleteIT.java index 3335e22f7f..67f0f2c52d 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationDeleteIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationDeleteIT.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.it.aggregation; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; @@ -27,6 +28,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import java.sql.Connection; import java.sql.ResultSet; @@ -36,6 +38,7 @@ import java.sql.Statement; import static org.apache.iotdb.db.constant.TestConstant.count; import static org.junit.Assert.assertEquals; +@RunWith(IoTDBTestRunner.class) @Category({LocalStandaloneIT.class, ClusterIT.class}) public class IoTDBAggregationDeleteIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationScanOrderIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationScanOrderIT.java index fd08b983c4..48646546f3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationScanOrderIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationScanOrderIT.java @@ -21,6 +21,7 @@ package org.apache.iotdb.db.it.aggregation; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; @@ -28,12 +29,14 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import static org.apache.iotdb.db.constant.TestConstant.firstValue; import static org.apache.iotdb.db.constant.TestConstant.lastValue; import static org.apache.iotdb.db.it.utils.TestUtils.prepareData; import static org.apache.iotdb.db.it.utils.TestUtils.resultSetEqualWithDescOrderTest; +@RunWith(IoTDBTestRunner.class) @Category({LocalStandaloneIT.class, ClusterIT.class}) public class IoTDBAggregationScanOrderIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationSmallDataIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationSmallDataIT.java index bf173d6643..8b2006c736 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationSmallDataIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationSmallDataIT.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.it.aggregation; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; @@ -29,6 +30,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import java.sql.Connection; import java.sql.ResultSet; @@ -47,6 +49,7 @@ import static org.apache.iotdb.db.constant.TestConstant.sum; import static org.junit.Assert.fail; /** Multiple aggregation with filter test. */ +@RunWith(IoTDBTestRunner.class) @Category({LocalStandaloneIT.class, ClusterIT.class}) public class IoTDBAggregationSmallDataIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBTagAggregationIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBTagAggregationIT.java index c3a6989a1b..e679657064 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBTagAggregationIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBTagAggregationIT.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.it.aggregation; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.junit.AfterClass; @@ -28,6 +29,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import java.sql.Connection; import java.sql.ResultSet; @@ -40,6 +42,7 @@ import java.util.Set; import static org.junit.Assert.fail; +@RunWith(IoTDBTestRunner.class) @Category({ClusterIT.class}) public class IoTDBTagAggregationIT { private static final String[] DATASET = diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletion2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletion2IT.java index 23b894fae7..ef09e695e5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletion2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletion2IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletionIT.java index aca4adc514..67ef34fa4e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletionIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQuery2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQuery2IT.java index 4606308a8e..f5e575727c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQuery2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQuery2IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQuery3IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQuery3IT.java index 462ef7fda7..410c8a3189 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQuery3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQuery3IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java index 0339faee46..6ef4aef078 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery2IT.java index f0fadcbe96..76355e4638 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery2IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery3IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery3IT.java index fb01fa9a83..6d7aa59e84 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery3IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java index e44edf09dd..5d5942c99b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryWithDeletionIT.java index e98e500c2a..5bace03811 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryWithDeletionIT.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByLevelQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByLevelQueryIT.java index 2a6693949e..7e587bcace 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByLevelQueryIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByLevelQueryIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletion2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletion2IT.java index 8888370399..d674293057 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletion2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletion2IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletionIT.java index a1112d33fd..e457b53a44 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletionIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT.java index f4e8ea19c0..55a00a23df 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletionIT.java index bb60bd1c25..bf206b604e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletionIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletion2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletion2IT.java index d07e0778ba..8d6e5872a5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletion2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletion2IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletionIT.java index 6d4e1d8321..a74235f835 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithDeletionIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCache2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCache2IT.java index 45baf23c69..e4c0d79d23 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCache2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCache2IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheIT.java index d5a6b9e3ab..96848bc45f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheWithDeletion2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheWithDeletion2IT.java index 7ea0435c47..7f78869e73 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheWithDeletion2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheWithDeletion2IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheWithDeletionIT.java index b55db3df3e..0418e72c58 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBLastQueryWithoutLastCacheWithDeletionIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBRawQueryWithoutValueFilterWithDeletion2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBRawQueryWithoutValueFilterWithDeletion2IT.java index 71c24de337..35e0e71f64 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBRawQueryWithoutValueFilterWithDeletion2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBRawQueryWithoutValueFilterWithDeletion2IT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBRawQueryWithoutValueFilterWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBRawQueryWithoutValueFilterWithDeletionIT.java index aad26a1580..8fc7c825f7 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBRawQueryWithoutValueFilterWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBRawQueryWithoutValueFilterWithDeletionIT.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.it.aligned; +import org.apache.iotdb.db.it.utils.AlignedWriteUtil; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/AlignedWriteUtil.java b/integration-test/src/test/java/org/apache/iotdb/db/it/utils/AlignedWriteUtil.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/db/it/aligned/AlignedWriteUtil.java rename to integration-test/src/test/java/org/apache/iotdb/db/it/utils/AlignedWriteUtil.java index 4b7b73e2fe..5b7cd25a5e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/AlignedWriteUtil.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/utils/AlignedWriteUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.it.aligned; +package org.apache.iotdb.db.it.utils; import org.apache.iotdb.it.env.EnvFactory; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAllNullIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAllNullIT.java index 6d040d4e51..2dbc153eb9 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAllNullIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAllNullIT.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.it.withoutNull; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.junit.AfterClass; @@ -27,6 +28,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import java.sql.Connection; import java.sql.ResultSet; @@ -37,6 +39,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @Ignore // TODO When filtering data after group by is supported +@RunWith(IoTDBTestRunner.class) @Category({ClusterIT.class}) // TODO After old StandAlone remove public class IoTDBWithoutAllNullIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAnyNullIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAnyNullIT.java index 10fda15bcf..ffa9a9ff31 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAnyNullIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutAnyNullIT.java @@ -20,12 +20,14 @@ package org.apache.iotdb.db.it.withoutNull; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import java.sql.Connection; import java.sql.ResultSet; @@ -35,6 +37,7 @@ import static org.apache.iotdb.db.constant.TestConstant.TIMESTAMP_STR; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +@RunWith(IoTDBTestRunner.class) @Category({ClusterIT.class}) // TODO After old StandAlone remove public class IoTDBWithoutAnyNullIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAllFilterIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAllFilterIT.java index 4007665c99..632acc2cbd 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAllFilterIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAllFilterIT.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.it.withoutNull; import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.junit.AfterClass; @@ -28,6 +29,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import java.math.BigDecimal; import java.math.RoundingMode; @@ -37,6 +39,7 @@ import java.sql.Statement; import static org.junit.Assert.fail; +@RunWith(IoTDBTestRunner.class) @Category({ClusterIT.class}) // TODO After old StandAlone remove public class IoTDBWithoutNullAllFilterIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAnyFilterIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAnyFilterIT.java index bce708ae7d..e83214ac15 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAnyFilterIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/withoutNull/IoTDBWithoutNullAnyFilterIT.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.it.withoutNull; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.junit.AfterClass; @@ -27,6 +28,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; import java.math.BigDecimal; import java.math.RoundingMode; @@ -36,6 +38,7 @@ import java.sql.Statement; import static org.junit.Assert.fail; +@RunWith(IoTDBTestRunner.class) @Category({ClusterIT.class}) // TODO After old StandAlone remove public class IoTDBWithoutNullAnyFilterIT { diff --git a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedInsertIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedInsertIT.java rename to integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java index 31edca1841..f53c427ec1 100644 --- a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedInsertIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.session; +package org.apache.iotdb.session.it; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.it.env.ConfigFactory; @@ -26,6 +26,8 @@ import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; +import org.apache.iotdb.session.ISession; +import org.apache.iotdb.session.SessionDataSet; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.RowRecord; import org.apache.iotdb.tsfile.write.record.Tablet; diff --git a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionComplexIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionComplexIT.java rename to integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java index d63840c28e..e752befc39 100644 --- a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionComplexIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.session; +package org.apache.iotdb.session.it; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -30,6 +30,8 @@ import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; +import org.apache.iotdb.session.ISession; +import org.apache.iotdb.session.SessionDataSet; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; diff --git a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionDisableMemControlIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionDisableMemControlIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionDisableMemControlIT.java rename to integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionDisableMemControlIT.java index 7861a7b3c8..8b4d80f4ba 100644 --- a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionDisableMemControlIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionDisableMemControlIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.session; +package org.apache.iotdb.session.it; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.it.env.ConfigFactory; @@ -25,6 +25,8 @@ import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.StatementExecutionException; +import org.apache.iotdb.session.ISession; +import org.apache.iotdb.session.SessionDataSet; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; diff --git a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionInsertNulIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertNulIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionInsertNulIT.java rename to integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertNulIT.java index 1e475b32ec..8243ffbe01 100644 --- a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionInsertNulIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertNulIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.session; +package org.apache.iotdb.session.it; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.it.env.EnvFactory; @@ -25,6 +25,8 @@ import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; +import org.apache.iotdb.session.ISession; +import org.apache.iotdb.session.SessionDataSet; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; diff --git a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java rename to integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java index 9609b5c11d..3c811f380f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.session; +package org.apache.iotdb.session.it; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -29,6 +29,8 @@ import org.apache.iotdb.rpc.BatchExecutionException; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.TSStatusCode; +import org.apache.iotdb.session.ISession; +import org.apache.iotdb.session.SessionDataSet; import org.apache.iotdb.session.template.InternalNode; import org.apache.iotdb.session.template.MeasurementNode; import org.apache.iotdb.session.template.Template; diff --git a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionSyntaxConventionIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSyntaxConventionIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionSyntaxConventionIT.java rename to integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSyntaxConventionIT.java index 57f834b932..9b3a24160c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/session/IoTDBSessionSyntaxConventionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSyntaxConventionIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.session; +package org.apache.iotdb.session.it; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.it.env.EnvFactory; @@ -24,6 +24,8 @@ import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.StatementExecutionException; +import org.apache.iotdb.session.ISession; +import org.apache.iotdb.session.SessionDataSet; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; diff --git a/integration-test/src/test/java/org/apache/iotdb/session/SessionTest.java b/integration-test/src/test/java/org/apache/iotdb/session/it/SessionIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/session/SessionTest.java rename to integration-test/src/test/java/org/apache/iotdb/session/it/SessionIT.java index 88f3416b05..351285f730 100644 --- a/integration-test/src/test/java/org/apache/iotdb/session/SessionTest.java +++ b/integration-test/src/test/java/org/apache/iotdb/session/it/SessionIT.java @@ -16,11 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.session; +package org.apache.iotdb.session.it; import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; +import org.apache.iotdb.session.ISession; +import org.apache.iotdb.session.SessionDataSet; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; @@ -32,6 +35,7 @@ import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; @@ -40,7 +44,8 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -public class SessionTest { +@RunWith(IoTDBTestRunner.class) +public class SessionIT { @Before public void setUp() throws Exception {
