diff --git a/presto-local-file/src/test/java/com/facebook/presto/localfile/TestLocalFileSplit.java b/presto-local-file/src/test/java/com/facebook/presto/localfile/TestLocalFileSplit.java index e00907d1d205..818a44dbe4dd 100644 --- a/presto-local-file/src/test/java/com/facebook/presto/localfile/TestLocalFileSplit.java +++ b/presto-local-file/src/test/java/com/facebook/presto/localfile/TestLocalFileSplit.java @@ -17,7 +17,6 @@ import com.facebook.presto.spi.predicate.TupleDomain; import com.google.common.collect.ImmutableList; import io.airlift.json.JsonCodec; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import static io.airlift.json.JsonCodec.jsonCodec; @@ -25,15 +24,8 @@ public class TestLocalFileSplit { - private HostAddress address; - private LocalFileSplit split; - - @BeforeMethod - public void setUp() - { - address = HostAddress.fromParts("localhost", 1234); - split = new LocalFileSplit(address, LocalFileTables.HttpRequestLogTable.getSchemaTableName(), TupleDomain.all()); - } + private final HostAddress address = HostAddress.fromParts("localhost", 1234); + private final LocalFileSplit split = new LocalFileSplit(address, LocalFileTables.HttpRequestLogTable.getSchemaTableName(), TupleDomain.all()); @Test public void testJsonRoundTrip() diff --git a/presto-main/src/test/java/com/facebook/presto/cost/BaseStatsCalculatorTest.java b/presto-main/src/test/java/com/facebook/presto/cost/BaseStatsCalculatorTest.java index 53629f8d6b0c..51fa1e59cefa 100644 --- a/presto-main/src/test/java/com/facebook/presto/cost/BaseStatsCalculatorTest.java +++ b/presto-main/src/test/java/com/facebook/presto/cost/BaseStatsCalculatorTest.java @@ -13,20 +13,20 @@ */ package com.facebook.presto.cost; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; public abstract class BaseStatsCalculatorTest { private StatsCalculatorTester tester; - @BeforeMethod + @BeforeClass public void setUp() { tester = new StatsCalculatorTester(); } - @AfterMethod + @AfterClass public void tearDown() { tester.close(); diff --git a/presto-main/src/test/java/com/facebook/presto/cost/TestComparisonStatsCalculator.java b/presto-main/src/test/java/com/facebook/presto/cost/TestComparisonStatsCalculator.java index 74d00ea54e34..c784e12bd93d 100644 --- a/presto-main/src/test/java/com/facebook/presto/cost/TestComparisonStatsCalculator.java +++ b/presto-main/src/test/java/com/facebook/presto/cost/TestComparisonStatsCalculator.java @@ -25,7 +25,7 @@ import com.facebook.presto.sql.tree.StringLiteral; import com.facebook.presto.sql.tree.SymbolReference; import com.google.common.collect.ImmutableMap; -import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import java.util.Map; @@ -39,7 +39,6 @@ import static java.lang.Double.NaN; import static java.lang.Double.POSITIVE_INFINITY; -@Test(singleThreaded = true) public class TestComparisonStatsCalculator { private FilterStatsCalculator filterStatsCalculator; @@ -47,7 +46,7 @@ public class TestComparisonStatsCalculator private PlanNodeStatsEstimate standardInputStatistics; private Map types; - @BeforeMethod + @BeforeClass public void setUp() throws Exception { diff --git a/presto-main/src/test/java/com/facebook/presto/cost/TestFilterStatsCalculator.java b/presto-main/src/test/java/com/facebook/presto/cost/TestFilterStatsCalculator.java index 042ecd10125e..ac860351fcdf 100644 --- a/presto-main/src/test/java/com/facebook/presto/cost/TestFilterStatsCalculator.java +++ b/presto-main/src/test/java/com/facebook/presto/cost/TestFilterStatsCalculator.java @@ -31,7 +31,7 @@ import com.facebook.presto.sql.tree.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import java.util.Map; @@ -45,7 +45,6 @@ import static java.lang.Double.NaN; import static java.lang.Double.POSITIVE_INFINITY; -@Test(singleThreaded = true) public class TestFilterStatsCalculator { private FilterStatsCalculator statsCalculator; @@ -53,7 +52,7 @@ public class TestFilterStatsCalculator private Map standardTypes; private Session session; - @BeforeMethod + @BeforeClass public void setUp() throws Exception { @@ -130,7 +129,7 @@ public void setUp() statsCalculator = new FilterStatsCalculator(MetadataManager.createTestMetadataManager()); } - public PlanNodeStatsAssertion assertExpression(Expression expression) + private PlanNodeStatsAssertion assertExpression(Expression expression) { return PlanNodeStatsAssertion.assertThat(statsCalculator.filterStats(standardInputStatistics, expression, diff --git a/presto-main/src/test/java/com/facebook/presto/cost/TestOutputNodeStats.java b/presto-main/src/test/java/com/facebook/presto/cost/TestOutputNodeStats.java index b4d5cb773108..21e91384a3e1 100644 --- a/presto-main/src/test/java/com/facebook/presto/cost/TestOutputNodeStats.java +++ b/presto-main/src/test/java/com/facebook/presto/cost/TestOutputNodeStats.java @@ -20,7 +20,6 @@ import static com.facebook.presto.spi.type.DoubleType.DOUBLE; import static java.lang.Double.POSITIVE_INFINITY; -@Test(singleThreaded = true) public class TestOutputNodeStats extends BaseStatsCalculatorTest { diff --git a/presto-main/src/test/java/com/facebook/presto/cost/TestScalarStatsCalculator.java b/presto-main/src/test/java/com/facebook/presto/cost/TestScalarStatsCalculator.java index 5b1d1809ae52..e17f9b04d93a 100644 --- a/presto-main/src/test/java/com/facebook/presto/cost/TestScalarStatsCalculator.java +++ b/presto-main/src/test/java/com/facebook/presto/cost/TestScalarStatsCalculator.java @@ -24,7 +24,7 @@ import com.facebook.presto.sql.tree.NullLiteral; import com.facebook.presto.sql.tree.StringLiteral; import com.facebook.presto.sql.tree.SymbolReference; -import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static com.facebook.presto.cost.PlanNodeStatsEstimate.UNKNOWN_STATS; @@ -39,7 +39,7 @@ public class TestScalarStatsCalculator private Session session; private final SqlParser sqlParser = new SqlParser(); - @BeforeMethod + @BeforeClass public void setUp() { calculator = new ScalarStatsCalculator(MetadataManager.createTestMetadataManager()); diff --git a/presto-main/src/test/java/com/facebook/presto/cost/TestValuesNodeStats.java b/presto-main/src/test/java/com/facebook/presto/cost/TestValuesNodeStats.java index 60790fea393d..9629dad08fb5 100644 --- a/presto-main/src/test/java/com/facebook/presto/cost/TestValuesNodeStats.java +++ b/presto-main/src/test/java/com/facebook/presto/cost/TestValuesNodeStats.java @@ -23,7 +23,6 @@ import static com.facebook.presto.sql.planner.iterative.rule.test.PlanBuilder.expression; import static com.facebook.presto.type.UnknownType.UNKNOWN; -@Test(singleThreaded = true) public class TestValuesNodeStats extends BaseStatsCalculatorTest { diff --git a/presto-main/src/test/java/com/facebook/presto/spiller/TestSpillSpaceTracker.java b/presto-main/src/test/java/com/facebook/presto/spiller/TestSpillSpaceTracker.java index 9f1eb338f9c0..e7f10941c75a 100644 --- a/presto-main/src/test/java/com/facebook/presto/spiller/TestSpillSpaceTracker.java +++ b/presto-main/src/test/java/com/facebook/presto/spiller/TestSpillSpaceTracker.java @@ -21,6 +21,7 @@ import static io.airlift.units.DataSize.Unit.MEGABYTE; import static org.testng.Assert.assertEquals; +@Test(singleThreaded = true) public class TestSpillSpaceTracker { private static final DataSize MAX_DATA_SIZE = new DataSize(10, MEGABYTE); diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestPickTableLayout.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestPickTableLayout.java index ce05aa3483e2..23fefc4234a2 100644 --- a/presto-main/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestPickTableLayout.java +++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestPickTableLayout.java @@ -28,7 +28,7 @@ import com.facebook.presto.tpch.TpchTableLayoutHandle; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import java.util.Map; @@ -46,13 +46,13 @@ public class TestPickTableLayout extends BaseRuleTest { - protected PickTableLayout pickTableLayout; + private PickTableLayout pickTableLayout; private TableHandle nationTableHandle; private TableLayoutHandle nationTableLayoutHandle; - protected ConnectorId connectorId; + private ConnectorId connectorId; - @BeforeMethod - public void setUpPerMethod() + @BeforeClass + public void setUpBeforeClass() { pickTableLayout = new PickTableLayout(tester().getMetadata()); diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/plan/TestWindowNode.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/plan/TestWindowNode.java index fce0c73d41a1..46d16ea6cf67 100644 --- a/presto-main/src/test/java/com/facebook/presto/sql/planner/plan/TestWindowNode.java +++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/plan/TestWindowNode.java @@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableSet; import io.airlift.json.ObjectMapperProvider; import io.airlift.slice.Slice; -import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import java.util.Map; @@ -70,7 +70,7 @@ Slice.class, new SliceDeserializer(), objectMapper = provider.get(); } - @BeforeMethod + @BeforeClass public void setUp() { symbolAllocator = new SymbolAllocator(); diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/backup/TestHttpBackupStore.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/backup/TestHttpBackupStore.java index 29beb6eb4964..a931b421ff92 100644 --- a/presto-raptor/src/test/java/com/facebook/presto/raptor/backup/TestHttpBackupStore.java +++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/backup/TestHttpBackupStore.java @@ -27,6 +27,7 @@ import io.airlift.node.testing.TestingNodeModule; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import javax.inject.Singleton; @@ -40,6 +41,7 @@ import static com.google.inject.util.Modules.override; import static io.airlift.jaxrs.JaxrsBinder.jaxrsBinder; +@Test(singleThreaded = true) public class TestHttpBackupStore extends AbstractTestBackupStore { diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestShardEjector.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestShardEjector.java index 1b519d124fdb..5e05cf242b73 100644 --- a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestShardEjector.java +++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestShardEjector.java @@ -57,6 +57,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +@Test(singleThreaded = true) public class TestShardEjector { private IDBI dbi; diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizerUtil.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizerUtil.java index 88f2842d99da..cb3f262a394a 100644 --- a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizerUtil.java +++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizerUtil.java @@ -59,6 +59,7 @@ import static com.google.common.io.RecursiveDeleteOption.ALLOW_INSECURE; import static org.testng.Assert.assertEquals; +@Test(singleThreaded = true) public class TestShardOrganizerUtil { private static final List COLUMNS = ImmutableList.of(