Fix or mark single-threaded all tests with @BeforeMethod

prestodb · Feb 21, 2018 · e72afda · e72afda
1 parent 6af79a3
commit e72afda
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 32 deletions.
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
@@ -17,23 +17,15 @@
 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;
 import static org.testng.Assert.assertEquals;
 
 public class TestLocalFileSplit
 {
-    private HostAddress address;
+    private final HostAddress address = HostAddress.fromParts("localhost", 1234);
-    private LocalFileSplit split;
+    private final LocalFileSplit split = new LocalFileSplit(address, LocalFileTables.HttpRequestLogTable.getSchemaTableName(), TupleDomain.all());
-
-    @BeforeMethod
-    public void setUp()
-    {
-        address = HostAddress.fromParts("localhost", 1234);
-        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
@@ -13,20 +13,20 @@
  */
 package com.facebook.presto.cost;
 
-import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeMethod;
+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
@@ -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,15 +39,14 @@
 import static java.lang.Double.NaN;
 import static java.lang.Double.POSITIVE_INFINITY;
 
-@Test(singleThreaded = true)
 public class TestComparisonStatsCalculator
 {
     private FilterStatsCalculator filterStatsCalculator;
     private Session session;
     private PlanNodeStatsEstimate standardInputStatistics;
     private Map<Symbol, Type> 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
@@ -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,15 +45,14 @@
 import static java.lang.Double.NaN;
 import static java.lang.Double.POSITIVE_INFINITY;
 
-@Test(singleThreaded = true)
 public class TestFilterStatsCalculator
 {
     private FilterStatsCalculator statsCalculator;
     private PlanNodeStatsEstimate standardInputStatistics;
     private Map<Symbol, Type> 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
@@ -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
@@ -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
@@ -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
@@ -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/...ain/src/test/java/com/facebook/presto/sql/planner/iterative/rule/TestPickTableLayout.java b/...ain/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
+    @BeforeClass
-    public void setUpPerMethod()
+    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
@@ -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
@@ -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<BackupStore>
 {

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
@@ -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/...src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizerUtil.java b/...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<ColumnInfo> COLUMNS = ImmutableList.of(