Repository: phoenix Updated Branches: refs/heads/3.0 c8b86f325 -> 6db262b46
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java index 7c6c342..4220108 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java @@ -56,14 +56,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 SubqueryIT extends BaseHBaseManagedTimeIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java index 42fe5b8..4d0b45d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java @@ -56,9 +56,8 @@ 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; -@Category(NeedsOwnMiniClusterTest.class) + public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java index c098a76..dbdef59 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java @@ -37,9 +37,8 @@ import org.apache.phoenix.schema.TableNotFoundException; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class TenantSpecificTablesDMLIT extends BaseTenantSpecificTablesIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java index 8abda3b..4fc4166 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java @@ -32,9 +32,8 @@ import org.apache.phoenix.schema.ColumnNotFoundException; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.QueryUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class TenantSpecificViewIndexIT extends BaseTenantSpecificViewIndexIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java index 388aaef..2e6784f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java @@ -22,9 +22,7 @@ package org.apache.phoenix.end2end; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) public class TenantSpecificViewIndexSaltedIT extends BaseTenantSpecificViewIndexIT { private static final Integer SALT_BUCKETS = 3; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java index e3c4776..54bbe9c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java @@ -17,17 +17,18 @@ */ package org.apache.phoenix.end2end; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; + import org.apache.phoenix.schema.IllegalDataException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class TimezoneOffsetFunctionIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java index 1fa88f5..52b5207 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java @@ -41,7 +41,6 @@ import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Tests for the TO_CHAR built-in function. @@ -50,7 +49,7 @@ import org.junit.experimental.categories.Category; * * @since 0.1 */ -@Category(ClientManagedTimeTest.class) + public class ToCharFunctionIT extends BaseClientManagedTimeIT { public static final String TO_CHAR_TABLE_NAME = "TO_CHAR_TABLE"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java index 431cbda..daf2c63 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToNumberFunctionIT.java @@ -41,7 +41,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Tests for the TO_NUMBER built-in function. @@ -50,7 +49,7 @@ import org.junit.experimental.categories.Category; * * @since 0.1 */ -@Category(ClientManagedTimeTest.class) + public class ToNumberFunctionIT extends BaseClientManagedTimeIT { // This test changes to locale to en_US, and saves the previous locale here http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java index 8d3a706..618680d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TopNIT.java @@ -40,9 +40,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 TopNIT extends BaseClientManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java index bed5146..4cd263e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TruncateFunctionIT.java @@ -39,9 +39,8 @@ import java.util.Properties; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.util.DateUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class TruncateFunctionIT extends BaseClientManagedTimeIT { private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_MS_DATE_FORMAT); private static final String DS1 = "1970-01-10 00:58:01.587"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java index e1ce962..3d1bb4a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java @@ -28,9 +28,8 @@ import java.sql.ResultSet; import java.util.Properties; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class UpsertBigValuesIT extends BaseHBaseManagedTimeIT { private static final long INTEGER_MIN_MINUS_ONE = (long)Integer.MIN_VALUE - 1; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java index e39619c..4b4f215 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java @@ -35,9 +35,8 @@ import java.util.Properties; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class UpsertSelectAutoCommitIT extends BaseHBaseManagedTimeIT { public UpsertSelectAutoCommitIT() { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java index ac54fe4..c1a960f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java @@ -53,9 +53,8 @@ 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; -@Category(ClientManagedTimeTest.class) + public class UpsertSelectIT extends BaseClientManagedTimeIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java index 043bba9..6389088 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertValuesIT.java @@ -43,9 +43,8 @@ import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.TestUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(ClientManagedTimeTest.class) + public class UpsertValuesIT extends BaseClientManagedTimeIT { @Test public void testGroupByWithLimitOverRowKey() throws Exception { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java index 6800379..07d6b32 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java @@ -47,10 +47,9 @@ import org.apache.phoenix.util.DateUtil; 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 VariableLengthPKIT extends BaseClientManagedTimeIT { private static Format format = DateUtil.getDateParser(DateUtil.DEFAULT_DATE_FORMAT); private static final String DS1 = "1970-01-01 00:58:00"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java index d997e36..1b89b8d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java @@ -35,9 +35,8 @@ import org.apache.phoenix.query.KeyRange; import org.apache.phoenix.schema.ReadOnlyTableException; import org.apache.phoenix.schema.TableNotFoundException; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class ViewIT extends BaseViewIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java index 88c88bd..d77ee2a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java @@ -18,11 +18,9 @@ package org.apache.phoenix.end2end.index; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.util.SchemaUtil; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class BaseIndexIT 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/index/BaseMutableIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java index f2a3578..279baa1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseMutableIndexIT.java @@ -27,12 +27,10 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Properties; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.TestUtil; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class BaseMutableIndexIT extends BaseIndexIT { public BaseMutableIndexIT() { } http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java index eb3a668..dd910f0 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java @@ -34,7 +34,6 @@ import java.sql.SQLException; import java.util.Properties; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryConstants; @@ -42,9 +41,8 @@ import org.apache.phoenix.schema.PTableKey; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class ImmutableIndexIT extends BaseHBaseManagedTimeIT { // Populate the test table with data. private static void populateTestTable() throws SQLException { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java index fb4b827..26878f8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java @@ -37,7 +37,6 @@ import java.util.Properties; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryConstants; @@ -51,9 +50,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(HBaseManagedTimeTest.class) + public class IndexMetadataIT extends BaseHBaseManagedTimeIT { private enum Order {ASC, DESC}; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java index 1e882b0..95d8259 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java @@ -74,6 +74,7 @@ import org.junit.experimental.categories.Category; * * @since 2.1 */ + @Category(NeedsOwnMiniClusterTest.class) public class MutableIndexFailureIT extends BaseTest { private static final int NUM_SLAVES = 4; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java index 5af80d9..b20069b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java @@ -35,7 +35,6 @@ import java.util.Properties; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; @@ -44,12 +43,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; import com.google.common.primitives.Doubles; -@Category(HBaseManagedTimeTest.class) public class MutableIndexIT extends BaseMutableIndexIT { @BeforeClass http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java index 0279283..112e4d3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Properties; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.query.QueryServices; @@ -40,11 +39,10 @@ import org.apache.phoenix.util.QueryUtil; 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 SaltedIndexIT extends BaseIndexIT { private static final int TABLE_SPLITS = 3; private static final int INDEX_SPLITS = 4; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java index 29eb325..faa7b7e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.Map; import org.apache.hadoop.hbase.client.HBaseAdmin; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.MetaDataUtil; @@ -35,11 +34,9 @@ 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(HBaseManagedTimeTest.class) public class ViewIndexIT extends BaseIndexIT { private String VIEW_NAME = "MY_VIEW"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java index a1cf5d1..06e63b2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableIT.java @@ -32,18 +32,16 @@ import java.sql.SQLException; import java.util.Properties; import org.apache.phoenix.end2end.BaseClientManagedTimeIT; -import org.apache.phoenix.end2end.ClientManagedTimeTest; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Tests for table with transparent salting. */ -@Category(ClientManagedTimeTest.class) + public class SaltedTableIT extends BaseClientManagedTimeIT { private 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/salted/SaltedTableUpsertSelectIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java index 8015cbc..0a11ec7 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java @@ -32,12 +32,10 @@ import java.sql.SQLException; import java.util.Properties; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class SaltedTableUpsertSelectIT extends BaseHBaseManagedTimeIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java index db517a6..53b267c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java @@ -30,12 +30,10 @@ import java.sql.ResultSet; import java.util.Properties; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class SaltedTableVarLengthRowKeyIT 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/hbase/index/covered/example/EndToEndCoveredIndexingIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java index 5196031..88bcb2a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/example/EndToEndCoveredIndexingIT.java @@ -857,6 +857,7 @@ public class EndToEndCoveredIndexingIT { // setup the primary table String indexedTableName = Bytes.toString(TestTable.getTableName()); + @SuppressWarnings("deprecation") HTableDescriptor pTable = new HTableDescriptor(indexedTableName); pTable.addFamily(new HColumnDescriptor(FAM)); pTable.addFamily(new HColumnDescriptor(FAM2)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java index 0f28c3a..43a155d 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java @@ -55,7 +55,6 @@ import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; -import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.hbase.index.IndexTestingUtils; import org.apache.phoenix.hbase.index.Indexer; import org.apache.phoenix.hbase.index.TableName; @@ -71,7 +70,6 @@ import org.junit.Assert; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Multimap; @@ -80,7 +78,7 @@ import com.google.common.collect.Multimap; * region was present on the same server, we have to make a best effort to not kill the server for * not succeeding on index writes while the index region is coming up. */ -@Category(NeedsOwnMiniClusterTest.class) + public class TestWALRecoveryCaching { private static final Log LOG = LogFactory.getLog(TestWALRecoveryCaching.class); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java ---------------------------------------------------------------------- diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java index a4b3655..7d4f7af 100644 --- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java +++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java @@ -30,15 +30,13 @@ import org.apache.flume.lifecycle.LifecycleState; import org.apache.flume.sink.DefaultSinkFactory; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.flume.serializer.EventSerializers; import org.apache.phoenix.flume.sink.PhoenixSink; import org.apache.phoenix.util.TestUtil; import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class PhoenixSinkIT extends BaseHBaseManagedTimeIT { private Context sinkContext; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java ---------------------------------------------------------------------- diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java index f86f039..0952747 100644 --- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java +++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java @@ -41,18 +41,16 @@ import org.apache.flume.event.EventBuilder; import org.apache.flume.lifecycle.LifecycleState; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.phoenix.flume.serializer.EventSerializers; import org.apache.phoenix.flume.sink.PhoenixSink; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) + public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT { private Context sinkContext; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java ---------------------------------------------------------------------- diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java index e0021d9..67abf62 100644 --- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java +++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java @@ -21,9 +21,9 @@ package org.apache.phoenix.pig; import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR; import static org.apache.phoenix.util.TestUtil.LOCALHOST; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertArrayEquals; import java.sql.Connection; import java.sql.DriverManager; @@ -33,7 +33,6 @@ import java.util.Collection; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; import org.apache.pig.ExecType; import org.apache.pig.PigServer; import org.apache.pig.backend.executionengine.ExecJob.JOB_STATUS; @@ -48,11 +47,10 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(HBaseManagedTimeTest.class) + public class PhoenixHBaseStorerIT extends BaseHBaseManagedTimeIT { private static TupleFactory tupleFactory; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java ---------------------------------------------------------------------- diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java index a6f6efd..efbfbf8 100644 --- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java +++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixPigConfigurationIT.java @@ -30,14 +30,12 @@ import java.util.Properties; import org.apache.hadoop.conf.Configuration; import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT; -import org.apache.phoenix.end2end.HBaseManagedTimeTest; 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; -@Category(HBaseManagedTimeTest.class) + public class PhoenixPigConfigurationIT extends BaseHBaseManagedTimeIT { private static final String zkQuorum = TestUtil.LOCALHOST + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fd8a415..4f8cbc6 100644 --- a/pom.xml +++ b/pom.xml @@ -109,15 +109,15 @@ <!-- Test Dependencies --> <mockito-all.version>1.8.5</mockito-all.version> - <junit.version>4.11</junit.version> + <junit.version>4.12-beta-3</junit.version> <!-- Plugin versions --> - <maven-eclipse-plugin.version>2.8</maven-eclipse-plugin.version> - <maven-build-helper-plugin.version>1.7</maven-build-helper-plugin.version> - <maven-surefire-plugin.version>2.17</maven-surefire-plugin.version> - <maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version> + <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version> + <maven-build-helper-plugin.version>1.9.1</maven-build-helper-plugin.version> + <maven-surefire-plugin.version>2.18</maven-surefire-plugin.version> + <maven-failsafe-plugin.version>2.18</maven-failsafe-plugin.version> <maven-dependency-plugin.version>2.1</maven-dependency-plugin.version> - <maven.assembly.version>2.4</maven.assembly.version> + <maven.assembly.version>2.5.2</maven.assembly.version> <maven.rat.version>0.8</maven.rat.version> <!-- Plugin options -->
