PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6db262b4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6db262b4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6db262b4 Branch: refs/heads/3.0 Commit: 6db262b468109845fd9edf76ad371c3f45b3023d Parents: c8b86f3 Author: James Taylor <[email protected]> Authored: Tue Nov 25 14:22:45 2014 -0800 Committer: James Taylor <[email protected]> Committed: Tue Nov 25 14:22:45 2014 -0800 ---------------------------------------------------------------------- .../WALReplayWithIndexWritesAndCompressedWALIT.java | 14 ++++++++------ .../java/org/apache/phoenix/end2end/AlterTableIT.java | 3 +-- .../org/apache/phoenix/end2end/ArithmeticQueryIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/ArrayIT.java | 2 -- .../java/org/apache/phoenix/end2end/AutoCommitIT.java | 3 +-- .../end2end/BaseOwnClusterClientManagedTimeIT.java | 3 +-- .../end2end/BaseOwnClusterHBaseManagedTimeIT.java | 3 +-- .../java/org/apache/phoenix/end2end/BaseQueryIT.java | 2 -- .../phoenix/end2end/BaseTenantSpecificTablesIT.java | 3 +-- .../end2end/BaseTenantSpecificViewIndexIT.java | 1 + .../java/org/apache/phoenix/end2end/BaseViewIT.java | 2 -- .../org/apache/phoenix/end2end/BinaryRowKeyIT.java | 3 +-- .../apache/phoenix/end2end/CSVCommonsLoaderIT.java | 3 +-- .../org/apache/phoenix/end2end/CaseStatementIT.java | 2 -- .../org/apache/phoenix/end2end/CastAndCoerceIT.java | 2 -- .../phoenix/end2end/ClientTimeArithmeticQueryIT.java | 3 +-- .../apache/phoenix/end2end/CoalesceFunctionIT.java | 3 +-- .../end2end/ColumnProjectionOptimizationIT.java | 2 -- .../phoenix/end2end/CompareDecimalToLongIT.java | 3 +-- .../phoenix/end2end/ConvertTimezoneFunctionIT.java | 3 +-- .../phoenix/end2end/CountDistinctCompressionIT.java | 3 +-- .../org/apache/phoenix/end2end/CreateTableIT.java | 3 +-- .../apache/phoenix/end2end/CustomEntityDataIT.java | 3 +-- .../org/apache/phoenix/end2end/DecodeFunctionIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/DeleteIT.java | 2 -- .../org/apache/phoenix/end2end/DerivedTableIT.java | 2 -- .../org/apache/phoenix/end2end/DistinctCountIT.java | 3 +-- .../org/apache/phoenix/end2end/DynamicColumnIT.java | 2 -- .../org/apache/phoenix/end2end/DynamicFamilyIT.java | 2 -- .../org/apache/phoenix/end2end/DynamicUpsertIT.java | 3 +-- .../org/apache/phoenix/end2end/EvaluationOfORIT.java | 2 -- .../apache/phoenix/end2end/ExecuteStatementsIT.java | 3 +-- .../apache/phoenix/end2end/ExtendedQueryExecIT.java | 3 +-- .../java/org/apache/phoenix/end2end/FunkyNamesIT.java | 3 +-- .../org/apache/phoenix/end2end/GroupByCaseIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/GroupByIT.java | 3 +-- .../java/org/apache/phoenix/end2end/HashJoinIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/InListIT.java | 4 +--- .../org/apache/phoenix/end2end/InMemoryOrderByIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/IsNullIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/KeyOnlyIT.java | 3 +-- .../apache/phoenix/end2end/LastValueFunctionIT.java | 3 +-- .../org/apache/phoenix/end2end/LpadFunctionIT.java | 3 +-- .../org/apache/phoenix/end2end/MD5FunctionIT.java | 3 +-- .../phoenix/end2end/MappingTableDataTypeIT.java | 3 +-- .../apache/phoenix/end2end/ModulusExpressionIT.java | 5 ++--- .../apache/phoenix/end2end/MultiCfQueryExecIT.java | 3 +-- .../apache/phoenix/end2end/NativeHBaseTypesIT.java | 3 +-- .../java/org/apache/phoenix/end2end/NotQueryIT.java | 3 +-- .../apache/phoenix/end2end/NthValueFunctionIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/OrderByIT.java | 2 -- .../apache/phoenix/end2end/ParallelIteratorsIT.java | 3 +-- .../java/org/apache/phoenix/end2end/PercentileIT.java | 3 +-- .../org/apache/phoenix/end2end/ProductMetricsIT.java | 3 +-- .../phoenix/end2end/QueryDatabaseMetaDataIT.java | 3 +-- .../apache/phoenix/end2end/QueryExecWithoutSCNIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/QueryIT.java | 3 +-- .../java/org/apache/phoenix/end2end/QueryMoreIT.java | 3 +-- .../org/apache/phoenix/end2end/QueryWithLimitIT.java | 3 +-- .../apache/phoenix/end2end/ReadIsolationLevelIT.java | 3 +-- .../java/org/apache/phoenix/end2end/ReadOnlyIT.java | 3 +-- .../apache/phoenix/end2end/RegexpSplitFunctionIT.java | 3 +-- .../phoenix/end2end/RegexpSubstrFunctionIT.java | 3 +-- .../org/apache/phoenix/end2end/ReverseFunctionIT.java | 3 +-- .../end2end/RoundFloorCeilFunctionsEnd2EndIT.java | 3 +-- .../apache/phoenix/end2end/RowValueConstructorIT.java | 3 +-- .../java/org/apache/phoenix/end2end/SaltedViewIT.java | 3 +-- .../java/org/apache/phoenix/end2end/ScanQueryIT.java | 3 +-- .../java/org/apache/phoenix/end2end/SequenceIT.java | 3 +-- .../org/apache/phoenix/end2end/ServerExceptionIT.java | 3 +-- .../phoenix/end2end/SkipScanAfterManualSplitIT.java | 3 +-- .../org/apache/phoenix/end2end/SkipScanQueryIT.java | 3 +-- .../org/apache/phoenix/end2end/SortMergeJoinIT.java | 3 +-- .../java/org/apache/phoenix/end2end/SortOrderFIT.java | 3 +-- .../apache/phoenix/end2end/SpillableGroupByIT.java | 3 +-- .../org/apache/phoenix/end2end/SpooledOrderByIT.java | 3 +-- .../phoenix/end2end/SpooledSortMergeJoinIT.java | 2 -- .../org/apache/phoenix/end2end/StatementHintsIT.java | 3 +-- .../org/apache/phoenix/end2end/StatsCollectorIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/StddevIT.java | 3 +-- .../java/org/apache/phoenix/end2end/SubqueryIT.java | 3 +-- .../phoenix/end2end/TenantSpecificTablesDDLIT.java | 3 +-- .../phoenix/end2end/TenantSpecificTablesDMLIT.java | 3 +-- .../phoenix/end2end/TenantSpecificViewIndexIT.java | 3 +-- .../end2end/TenantSpecificViewIndexSaltedIT.java | 2 -- .../phoenix/end2end/TimezoneOffsetFunctionIT.java | 11 ++++++----- .../org/apache/phoenix/end2end/ToCharFunctionIT.java | 3 +-- .../apache/phoenix/end2end/ToNumberFunctionIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/TopNIT.java | 3 +-- .../apache/phoenix/end2end/TruncateFunctionIT.java | 3 +-- .../org/apache/phoenix/end2end/UpsertBigValuesIT.java | 3 +-- .../phoenix/end2end/UpsertSelectAutoCommitIT.java | 3 +-- .../org/apache/phoenix/end2end/UpsertSelectIT.java | 3 +-- .../org/apache/phoenix/end2end/UpsertValuesIT.java | 3 +-- .../apache/phoenix/end2end/VariableLengthPKIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/ViewIT.java | 3 +-- .../org/apache/phoenix/end2end/index/BaseIndexIT.java | 4 +--- .../phoenix/end2end/index/BaseMutableIndexIT.java | 4 +--- .../phoenix/end2end/index/ImmutableIndexIT.java | 4 +--- .../apache/phoenix/end2end/index/IndexMetadataIT.java | 4 +--- .../phoenix/end2end/index/MutableIndexFailureIT.java | 1 + .../apache/phoenix/end2end/index/MutableIndexIT.java | 3 --- .../apache/phoenix/end2end/index/SaltedIndexIT.java | 4 +--- .../org/apache/phoenix/end2end/index/ViewIndexIT.java | 3 --- .../apache/phoenix/end2end/salted/SaltedTableIT.java | 4 +--- .../end2end/salted/SaltedTableUpsertSelectIT.java | 4 +--- .../end2end/salted/SaltedTableVarLengthRowKeyIT.java | 4 +--- .../covered/example/EndToEndCoveredIndexingIT.java | 1 + .../hbase/index/write/TestWALRecoveryCaching.java | 4 +--- .../java/org/apache/phoenix/flume/PhoenixSinkIT.java | 4 +--- .../apache/phoenix/flume/RegexEventSerializerIT.java | 4 +--- .../org/apache/phoenix/pig/PhoenixHBaseStorerIT.java | 6 ++---- .../apache/phoenix/pig/PhoenixPigConfigurationIT.java | 4 +--- pom.xml | 12 ++++++------ 114 files changed, 117 insertions(+), 251 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java index 64fd6cd..57076ea 100644 --- a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java +++ b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndCompressedWALIT.java @@ -47,18 +47,19 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.RegionServerAccounting; import org.apache.hadoop.hbase.regionserver.RegionServerServices; import org.apache.hadoop.hbase.util.Bytes; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.mockito.Mockito; - +import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.hbase.index.IndexTestingUtils; import org.apache.phoenix.hbase.index.TableName; import org.apache.phoenix.hbase.index.covered.example.ColumnGroup; import org.apache.phoenix.hbase.index.covered.example.CoveredColumn; import org.apache.phoenix.hbase.index.covered.example.CoveredColumnIndexSpecifierBuilder; import org.apache.phoenix.hbase.index.covered.example.CoveredColumnIndexer; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.mockito.Mockito; /** * For pre-0.94.9 instances, this class tests correctly deserializing WALEdits w/o compression. Post @@ -72,6 +73,7 @@ import org.apache.phoenix.hbase.index.covered.example.CoveredColumnIndexer; * This test should only have a single test - otherwise we will start/stop the minicluster multiple * times, which is probably not what you want to do (mostly because its so much effort). */ +@Category(NeedsOwnMiniClusterTest.class) public class WALReplayWithIndexWritesAndCompressedWALIT { public static final Log LOG = LogFactory.getLog(TestWALReplay.class); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java index 9c14f16..283154b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java @@ -51,9 +51,8 @@ import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class AlterTableIT extends BaseHBaseManagedTimeIT { public static final String SCHEMA_NAME = ""; public static final String DATA_TABLE_NAME = "T"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java index 52c76a9..21af737 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java @@ -35,12 +35,11 @@ import java.util.Properties; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; -@Category(HBaseManagedTimeTest.class) + public class ArithmeticQueryIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java index f44a517..9ee345f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java @@ -44,11 +44,9 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.StringUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.primitives.Floats; -@Category(ClientManagedTimeTest.class) public class ArrayIT extends BaseClientManagedTimeIT { private static final String SIMPLE_TABLE_WITH_ARRAY = "SIMPLE_TABLE_WITH_ARRAY"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java index b6aa056..aa92c5e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java @@ -30,9 +30,8 @@ import java.util.Properties; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class AutoCommitIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java index 3920c7d..01d8538 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterClientManagedTimeIT.java @@ -20,9 +20,8 @@ package org.apache.phoenix.end2end; import org.junit.After; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class BaseOwnClusterClientManagedTimeIT extends BaseOwnClusterIT { @After public void cleanUpAfterTest() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java index c420473..d4096f9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOwnClusterHBaseManagedTimeIT.java @@ -21,9 +21,8 @@ package org.apache.phoenix.end2end; import org.apache.hadoop.hbase.HConstants; import org.junit.After; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class BaseOwnClusterHBaseManagedTimeIT extends BaseOwnClusterIT { @After public void cleanUpAfterTest() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java index 2b00096..09b0547 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java @@ -46,7 +46,6 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -64,7 +63,6 @@ import com.google.common.collect.Sets; * @since 0.1 */ -@Category(ClientManagedTimeTest.class) @RunWith(Parameterized.class) public abstract class BaseQueryIT extends BaseClientManagedTimeIT { protected static final String tenantId = getOrganizationId(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java index 6d6bffc..1e87b8f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java @@ -26,11 +26,10 @@ import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) + public abstract class BaseTenantSpecificTablesIT extends BaseOwnClusterClientManagedTimeIT { protected static final String TENANT_ID = "ZZTop"; protected static final String TENANT_TYPE_ID = "abc"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java index c6a6a7e..c1e82db 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java @@ -115,6 +115,7 @@ public class BaseTenantSpecificViewIndexIT extends BaseHBaseManagedTimeIT { return DriverManager.getConnection(getUrl(), props); } + @SuppressWarnings("unchecked") private void verifyViewData(Connection conn, String valuePrefix) throws SQLException { String query = "SELECT k1, k2, v2 FROM v WHERE v2='" + valuePrefix + "v2-1'"; ResultSet rs = conn.createStatement().executeQuery(query); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java index 6466932..c5cbd2f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseViewIT.java @@ -35,11 +35,9 @@ import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) public class BaseViewIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java index e4aa070..544284d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java @@ -32,9 +32,8 @@ import java.util.Properties; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class BinaryRowKeyIT extends BaseHBaseManagedTimeIT { private static void initTableValues() throws SQLException { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java index f51f908..e98d5f3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java @@ -42,8 +42,7 @@ import org.apache.phoenix.util.CSVCommonsLoader; import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.PhoenixRuntime; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class CSVCommonsLoaderIT extends BaseHBaseManagedTimeIT { private static final String DATATYPE_TABLE = "DATATYPE"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java index 6354de3..079ca50 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java @@ -47,14 +47,12 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; -@Category(ClientManagedTimeTest.class) @RunWith(Parameterized.class) public class CaseStatementIT extends BaseQueryIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java index 7a0c3e3..ce040b9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java @@ -38,12 +38,10 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(ClientManagedTimeTest.class) @RunWith(Parameterized.class) public class CastAndCoerceIT extends BaseQueryIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java index d709b9c..17ed19d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientTimeArithmeticQueryIT.java @@ -51,14 +51,13 @@ import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.TestUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; -@Category(ClientManagedTimeTest.class) + @RunWith(Parameterized.class) public class ClientTimeArithmeticQueryIT extends BaseQueryIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java index 2a037fa..1ad647b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java @@ -36,9 +36,8 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class CoalesceFunctionIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java index fee2420..d42679b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnProjectionOptimizationIT.java @@ -57,9 +57,7 @@ import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) public class ColumnProjectionOptimizationIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java index d67dbb9..3a358c4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CompareDecimalToLongIT.java @@ -29,9 +29,8 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class CompareDecimalToLongIT extends BaseClientManagedTimeIT { protected static void initTableValues(byte[][] splits, long ts) throws Exception { ensureTableCreated(getUrl(),"LongInKeyTest",splits, ts-2); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java index d39e37a..e390548 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java @@ -24,13 +24,12 @@ import java.sql.ResultSet; import org.apache.phoenix.schema.IllegalDataException; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * CONVERT_TZ(date, 'from_timezone', 'to_timezone') tests * */ -@Category(HBaseManagedTimeTest.class) + public class ConvertTimezoneFunctionIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java index 97703f5..b4c84b0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CountDistinctCompressionIT.java @@ -35,11 +35,10 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) + public class CountDistinctCompressionIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass public static void doSetup() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java index 0b5c105..e3bec28 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java @@ -38,9 +38,8 @@ import org.apache.phoenix.query.KeyRange; import org.apache.phoenix.schema.TableAlreadyExistsException; import org.apache.phoenix.util.PhoenixRuntime; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class CreateTableIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java index 8209e5c..3717396 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CustomEntityDataIT.java @@ -37,10 +37,9 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class CustomEntityDataIT extends BaseClientManagedTimeIT { protected static void initTableValues(String tenantId, byte[][] splits, long ts) throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java index 6852f74..ae259bc 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java @@ -31,9 +31,8 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.schema.PDataType; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class DecodeFunctionIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java index a2dd942..28f25bb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java @@ -34,9 +34,7 @@ import java.util.List; import org.apache.phoenix.util.QueryUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) public class DeleteIT extends BaseHBaseManagedTimeIT { private static final int NUMBER_OF_ROWS = 20; private static final int NTH_ROW_NULL = 5; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java index 8ef542a..430e5ab 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java @@ -50,14 +50,12 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; -@Category(ClientManagedTimeTest.class) @RunWith(Parameterized.class) public class DerivedTableIT extends BaseClientManagedTimeIT { private static final String tenantId = getOrganizationId(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java index 4b76d29..b1daacc 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctCountIT.java @@ -49,9 +49,8 @@ import org.apache.phoenix.schema.TableAlreadyExistsException; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class DistinctCountIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java index 35b8509..bfb175a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java @@ -46,7 +46,6 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Basic tests for Phoenix dynamic upserting @@ -55,7 +54,6 @@ import org.junit.experimental.categories.Category; * @since 1.3 */ -@Category(ClientManagedTimeTest.class) public class DynamicColumnIT extends BaseClientManagedTimeIT { private static final byte[] HBASE_DYNAMIC_COLUMNS_BYTES = SchemaUtil.getTableNameAsBytes(null, HBASE_DYNAMIC_COLUMNS); private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("A")); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java index 88ef0b3..32f0a01 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java @@ -49,7 +49,6 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Basic tests for Phoenix dynamic family querying "cf.*" @@ -61,7 +60,6 @@ import org.junit.experimental.categories.Category; @edu.umd.cs.findbugs.annotations.SuppressWarnings( value="RV_RETURN_VALUE_IGNORED", justification="Designed to ignore.") -@Category(HBaseManagedTimeTest.class) public class DynamicFamilyIT extends BaseHBaseManagedTimeIT { private static final String WEB_STATS = "WEB_STATS"; private static final String WEB_STATS_SCHEMA_NAME = ""; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java index b236f10..fe0d8b1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java @@ -36,7 +36,6 @@ import org.apache.phoenix.schema.ColumnFamilyNotFoundException; import org.apache.phoenix.util.PropertiesUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Basic tests for Phoenix dynamic upserting @@ -45,7 +44,7 @@ import org.junit.experimental.categories.Category; * @since 1.3 */ -@Category(ClientManagedTimeTest.class) + public class DynamicUpsertIT extends BaseClientManagedTimeIT { private static final String TABLE = "DynamicUpserts"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java index 0e59542..5edf7e2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java @@ -30,9 +30,7 @@ import java.util.Properties; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) public class EvaluationOfORIT extends BaseHBaseManagedTimeIT{ @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java index 0d64f2e..1b41bdd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java @@ -46,9 +46,8 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.util.PhoenixRuntime; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class ExecuteStatementsIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java index 9d15e32..377f6d6 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExtendedQueryExecIT.java @@ -34,7 +34,6 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; @@ -43,7 +42,7 @@ import org.junit.experimental.categories.Category; * Extended tests for Phoenix JDBC implementation * */ -@Category(ClientManagedTimeTest.class) + public class ExtendedQueryExecIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java index b66f221..11f91cd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FunkyNamesIT.java @@ -34,9 +34,8 @@ import org.apache.phoenix.schema.ColumnNotFoundException; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class FunkyNamesIT extends BaseClientManagedTimeIT { protected static void initTableValues(byte[][] splits, long ts) throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java index b811865..2b43337 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java @@ -35,9 +35,8 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class GroupByCaseIT extends BaseClientManagedTimeIT { private static String GROUPBY1 = "select " + http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java index 6002d58..55bce01 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java @@ -45,14 +45,13 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; -@Category(ClientManagedTimeTest.class) + @RunWith(Parameterized.class) public class GroupByIT extends BaseQueryIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java index 4de17de..2eba81c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java @@ -57,14 +57,13 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) + @RunWith(Parameterized.class) public class HashJoinIT extends BaseHBaseManagedTimeIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java index 920891b..449e44f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java @@ -36,13 +36,12 @@ import org.apache.phoenix.schema.PDataType; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.Lists; -@Category(HBaseManagedTimeTest.class) + public class InListIT extends BaseHBaseManagedTimeIT { @Test @@ -221,7 +220,6 @@ public class InListIT extends BaseHBaseManagedTimeIT { } } - @SuppressWarnings("unchecked") List<List<Object>> DEFAULT_UPSERTS = Arrays.asList(Arrays.<Object>asList(1, 2, 4, 5, 6, "row1"), Arrays.<Object>asList(2, 3, 4, 5, 6, "row2"), Arrays.<Object>asList(2, 3, 6, 4, 5, "row3"), http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java index 533143c..cc3b45f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java @@ -22,9 +22,8 @@ import java.util.Map; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class InMemoryOrderByIT extends OrderByIT { public InMemoryOrderByIT() { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java index cb9516c..9c60914 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java @@ -29,9 +29,8 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class IsNullIT extends BaseClientManagedTimeIT { @Test public void testIsNullInPk() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java index 42ee5ad..55d88cc 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java @@ -42,11 +42,10 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) + public class KeyOnlyIT extends BaseOwnClusterClientManagedTimeIT { @BeforeClass http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java index ff1751a..cbadc35 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java @@ -26,9 +26,8 @@ import java.sql.DriverManager; import java.sql.ResultSet; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class LastValueFunctionIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java index 2716f5e..0a9bedf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LpadFunctionIT.java @@ -29,14 +29,13 @@ import java.util.List; import org.apache.phoenix.util.TestUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; /** * Tests for the LPAD built-in function. */ -@Category(HBaseManagedTimeTest.class) + public class LpadFunctionIT extends BaseHBaseManagedTimeIT { /** http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java index bec5b65..ff7ebdb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java @@ -28,9 +28,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class MD5FunctionIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java index 096fb1b..4ea2eda 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java @@ -38,9 +38,8 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class MappingTableDataTypeIT extends BaseHBaseManagedTimeIT { @Test public void testMappingHbaseTableToPhoenixTable() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java index 5055793..7de85ea 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java @@ -21,18 +21,17 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import static org.junit.Assert.fail; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class ModulusExpressionIT extends BaseHBaseManagedTimeIT { private static final long SMALL_VALUE = 31L; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java index f120b11..f0b16a3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiCfQueryExecIT.java @@ -40,11 +40,10 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) + public class MultiCfQueryExecIT extends BaseOwnClusterClientManagedTimeIT { private static final String MULTI_CF = "MULTI_CF"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java index e579b14..1bf980a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NativeHBaseTypesIT.java @@ -53,7 +53,6 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; /** @@ -65,7 +64,7 @@ import org.junit.experimental.categories.Category; * * @since 0.1 */ -@Category(ClientManagedTimeTest.class) + public class NativeHBaseTypesIT extends BaseClientManagedTimeIT { private static final byte[] HBASE_NATIVE_BYTES = SchemaUtil.getTableNameAsBytes(HBASE_NATIVE_SCHEMA_NAME, HBASE_NATIVE); private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("1")); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java index d6f0c13..21074fc 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java @@ -43,7 +43,6 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -51,7 +50,7 @@ import org.junit.runners.Parameterized.Parameters; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; -@Category(ClientManagedTimeTest.class) + @RunWith(Parameterized.class) public class NotQueryIT extends BaseQueryIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java index ec5bf96..11ecc0d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java @@ -27,9 +27,8 @@ import java.sql.ResultSet; import java.util.ArrayList; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class NthValueFunctionIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java index 14a89cb..599dc31 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java @@ -41,9 +41,7 @@ import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Ignore; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) public class OrderByIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java index a1c6217..509ca90 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelIteratorsIT.java @@ -38,11 +38,10 @@ import org.apache.phoenix.schema.PDataType; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) + public class ParallelIteratorsIT extends BaseOwnClusterHBaseManagedTimeIT { private static final String STABLE_INDEX = "STABLE_INDEX"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java index b15a3e5..685daeb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java @@ -53,9 +53,8 @@ import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class PercentileIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java index 1daabb0..3d8c470 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ProductMetricsIT.java @@ -51,12 +51,11 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.TestUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -@Category(ClientManagedTimeTest.class) + public class ProductMetricsIT extends BaseClientManagedTimeIT { private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_DATE_FORMAT); private static final String PRODUCT_METRICS_NAME = "PRODUCT_METRICS"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java index 0f1f74b..1f0e532 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java @@ -77,9 +77,8 @@ import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TestUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java index 99060dd..534f77d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java @@ -30,9 +30,8 @@ import java.sql.ResultSet; import java.util.Properties; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class QueryExecWithoutSCNIT extends BaseHBaseManagedTimeIT { @Test public void testScanNoSCN() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java index 36d800a..2e82396 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java @@ -63,7 +63,6 @@ import org.apache.phoenix.util.ByteUtil; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; @@ -75,7 +74,7 @@ import org.junit.experimental.categories.Category; * @since 0.1 */ -@Category(ClientManagedTimeTest.class) + public class QueryIT extends BaseQueryIT { public QueryIT(String indexDDL) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java index e82abbb..af5e6fa 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java @@ -34,11 +34,10 @@ import org.apache.hadoop.hbase.util.Base64; import org.apache.hadoop.hbase.util.Pair; import org.apache.phoenix.util.PhoenixRuntime; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(HBaseManagedTimeTest.class) + public class QueryMoreIT extends BaseHBaseManagedTimeIT { private String dataTableName; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java index 2df9514..3198194 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryWithLimitIT.java @@ -41,11 +41,10 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) + public class QueryWithLimitIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java index 62a1e2b..caebcb5 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadIsolationLevelIT.java @@ -32,9 +32,8 @@ import java.util.Properties; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class ReadIsolationLevelIT extends BaseClientManagedTimeIT { private static final String ENTITY_ID1= "000000000000001"; private static final String ENTITY_ID2= "000000000000002"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java index a425d3a..fbebe08 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java @@ -30,9 +30,8 @@ import java.util.Properties; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class ReadOnlyIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java index 0bda438..5170089 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java @@ -32,9 +32,8 @@ import java.sql.SQLException; import java.sql.Types; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeIT { private void initTable(Connection conn, String val) throws SQLException { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java index be4646b..ff4b95e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java @@ -31,9 +31,8 @@ import java.sql.Statement; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class RegexpSubstrFunctionIT extends BaseHBaseManagedTimeIT { private int id; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java index 7dc58ab..f384d3a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java @@ -28,9 +28,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class ReverseFunctionIT extends BaseHBaseManagedTimeIT { private void initTable(Connection conn, String sortOrder, String s) throws Exception { String ddl = "CREATE TABLE REVERSE_TEST (pk VARCHAR NOT NULL PRIMARY KEY " + sortOrder + ", kv VARCHAR)"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java index c38f4d6..2cf08e9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFunctionsEnd2EndIT.java @@ -36,7 +36,6 @@ import org.apache.phoenix.expression.function.RoundFunction; import org.apache.phoenix.util.DateUtil; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; @@ -49,7 +48,7 @@ import com.google.common.primitives.Floats; * @since 3.0.0 */ -@Category(HBaseManagedTimeTest.class) + public class RoundFloorCeilFunctionsEnd2EndIT extends BaseHBaseManagedTimeIT { private static long millisPart = 660; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java index 9e3a5b0..be91eab 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java @@ -56,9 +56,8 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.TestUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class RowValueConstructorIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java index cc08d15..6cc855a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SaltedViewIT.java @@ -18,9 +18,8 @@ package org.apache.phoenix.end2end; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class SaltedViewIT extends BaseViewIT { /** http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java index f817c2b..c376f89 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanQueryIT.java @@ -51,7 +51,6 @@ import java.util.Set; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -60,7 +59,7 @@ import com.google.common.collect.Lists; import com.google.common.primitives.Doubles; import com.google.common.primitives.Floats; -@Category(ClientManagedTimeTest.class) + @RunWith(Parameterized.class) public class ScanQueryIT extends BaseQueryIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java index acaa1bb..98df26c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java @@ -48,11 +48,10 @@ import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(ClientManagedTimeTest.class) + public class SequenceIT extends BaseClientManagedTimeIT { private static final String NEXT_VAL_SQL = "SELECT NEXT VALUE FOR foo.bar FROM SYSTEM.\"SEQUENCE\""; private static final long BATCH_SIZE = 3; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java index d101fe3..5c8679d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java @@ -30,9 +30,8 @@ import java.util.Properties; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class ServerExceptionIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java index 3c0344c..1c82274 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java @@ -39,11 +39,10 @@ import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) + public class SkipScanAfterManualSplitIT extends BaseHBaseManagedTimeIT { private static final int BATCH_SIZE = 25; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java index db5d15b..7c509bb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java @@ -33,9 +33,8 @@ import java.util.List; import org.apache.phoenix.util.PhoenixRuntime; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class SkipScanQueryIT extends BaseHBaseManagedTimeIT { private void initIntInTable(Connection conn, List<Integer> data) throws SQLException { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java index e676cdb..12dc034 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java @@ -57,14 +57,13 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) + @RunWith(Parameterized.class) public class SortMergeJoinIT extends BaseHBaseManagedTimeIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java index 8c8bbcc..9fb7ea3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderFIT.java @@ -35,7 +35,6 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; @@ -43,7 +42,7 @@ import com.google.common.collect.Lists; * @since 1.2 */ -@Category(HBaseManagedTimeTest.class) + public class SortOrderFIT extends BaseHBaseManagedTimeIT { private static final String TABLE = "DescColumnSortOrderTest"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java index 36bbca8..70d5f1d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java @@ -38,7 +38,6 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; @@ -47,7 +46,7 @@ import com.google.common.collect.Maps; * and we wouldn't want that to be set for other tests sharing the same * cluster. */ -@Category(NeedsOwnMiniClusterTest.class) + public class SpillableGroupByIT extends BaseOwnClusterHBaseManagedTimeIT { private static final int NUM_ROWS_INSERTED = 1000; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java index c35ecab..bb09793 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java @@ -22,9 +22,8 @@ import java.util.Map; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class SpooledOrderByIT extends OrderByIT { @BeforeClass http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java index d602423..773a513 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java @@ -22,11 +22,9 @@ import java.util.Map; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) public class SpooledSortMergeJoinIT extends SortMergeJoinIT { public SpooledSortMergeJoinIT(String[] indexDDL, String[] plans) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java index 9c9f2c6..70246f9 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java @@ -30,14 +30,13 @@ import java.util.Properties; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * End-to-End tests on various statement hints. */ -@Category(HBaseManagedTimeTest.class) + public class StatementHintsIT extends BaseHBaseManagedTimeIT { private static void initTableValues() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java index 78e530c..39d5bd4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java @@ -49,11 +49,10 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(NeedsOwnMiniClusterTest.class) + public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { private static final String STATS_TEST_TABLE_NAME = "S"; private static final byte[] STATS_TEST_TABLE_BYTES = Bytes.toBytes(STATS_TEST_TABLE_NAME); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java index f3fef4b..c00b770 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java @@ -29,8 +29,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class StddevIT extends BaseHBaseManagedTimeIT { @Test
