CR comments incorporated

ExpediaGroup · Sep 17, 2020 · 816eeff · 816eeff
1 parent e51178f
commit 816eeff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/drone-fly-integration-tests/pom.xml b/drone-fly-integration-tests/pom.xml
@@ -15,6 +15,7 @@
       <groupId>com.expediagroup</groupId>
       <artifactId>drone-fly-app</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
       <exclusions>
         <exclusion>
           <groupId>com.tdunning</groupId>
@@ -42,6 +43,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
+      <scope>test</scope>
       <exclusions>
         <exclusion>
           <groupId>org.springframework.boot</groupId>
@@ -52,6 +54,7 @@
     <dependency>
       <groupId>org.springframework.kafka</groupId>
       <artifactId>spring-kafka</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.kafka</groupId>

diff --git a/...java/com/expediagroup/dataplatform/dronefly/core/integration/DroneFlyIntegrationTest.java b/...java/com/expediagroup/dataplatform/dronefly/core/integration/DroneFlyIntegrationTest.java
@@ -82,7 +82,7 @@ public class DroneFlyIntegrationTest {
 
   private @Mock HMSHandler hmsHandler;
 
-  protected final ExecutorService executorService = Executors.newFixedThreadPool(1);
+  private final ExecutorService executorService = Executors.newFixedThreadPool(1);
   private static Configuration CONF = new Configuration();
 
   private KafkaMetaStoreEventListener kafkaMetaStoreEventListener;
@@ -109,7 +109,7 @@ void setUp() throws InterruptedException {
     initKafkaListener();
 
     executorService.execute(() -> DroneFly.main(new String[] {}));
-    await().atMost(Duration.TEN_MINUTES).until(DroneFly::isRunning);
+    await().atMost(Duration.FIVE_MINUTES).until(DroneFly::isRunning);
   }
 
   @AfterEach

diff --git a/...com/expediagroup/dataplatform/dronefly/core/integration/DroneFlyIntegrationTestUtils.java b/...com/expediagroup/dataplatform/dronefly/core/integration/DroneFlyIntegrationTestUtils.java
@@ -33,16 +33,16 @@ public class DroneFlyIntegrationTestUtils {
   static final String TABLE = "table";
 
   public static Table buildTable() {
-    return buildTable(null);
+    return buildTable(TABLE);
   }
 
   public static Table buildTable(String tableName) {
     List<FieldSchema> partitions = Lists.newArrayList();
     partitions.add(new FieldSchema("a", "string", "comment"));
     partitions.add(new FieldSchema("b", "string", "comment"));
     partitions.add(new FieldSchema("c", "string", "comment"));
-    return new Table(tableName == null ? TABLE : tableName, DATABASE, "me", 1, 1, 1, new StorageDescriptor(),
-        partitions, buildTableParameters(), "originalText", "expandedText", "tableType");
+    return new Table(tableName, DATABASE, "me", 1, 1, 1, new StorageDescriptor(), partitions, buildTableParameters(),
+        "originalText", "expandedText", "tableType");
   }
 
   public static Partition buildPartition() {