Merge pull request #42 from datadrivencz/remove-reference-conf-from-c…

…ore-testjar [proxima-core] remove reference.conf from test-jar
O2-Czech-Republic · Mar 1, 2018 · a76be59 · a76be59
2 parents 37964a0 + 4291ddf
commit a76be59
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/core/src/test/java/cz/o2/proxima/repository/CommitLogReaderTest.java b/core/src/test/java/cz/o2/proxima/repository/CommitLogReaderTest.java
@@ -40,7 +40,9 @@
 public class CommitLogReaderTest {
 
   private final transient Repository repo = Repository.Builder.of(
-      ConfigFactory.load().resolve()).build();
+      ConfigFactory.load()
+          .withFallback(ConfigFactory.load("test-reference.conf"))
+          .resolve()).build();
 
   private transient LocalExecutor executor;
   private final transient EntityDescriptor entity = repo.findEntity("event").get();

diff --git a/core/src/test/java/cz/o2/proxima/repository/PartitionedViewTest.java b/core/src/test/java/cz/o2/proxima/repository/PartitionedViewTest.java
@@ -40,8 +40,10 @@
 public class PartitionedViewTest implements Serializable {
 
   private final transient Repository repo = Repository.Builder.of(
-      ConfigFactory.load().resolve()).build();
-
+      ConfigFactory.load()
+          .withFallback(ConfigFactory.load("test-reference.conf"))
+          .resolve()).build();
+
   private transient LocalExecutor executor;
   private final transient EntityDescriptor entity = repo.findEntity("event").get();
   private final transient AttributeDescriptor<?> attr = entity.findAttribute("data").get();

diff --git a/core/src/test/java/cz/o2/proxima/repository/RepositoryTest.java b/core/src/test/java/cz/o2/proxima/repository/RepositoryTest.java
@@ -40,7 +40,10 @@
  */
 public class RepositoryTest {
 
-  final Repository repo = Repository.Builder.of(ConfigFactory.load().resolve()).build();
+  final Repository repo = Repository.Builder.of(
+      ConfigFactory.load()
+          .withFallback(ConfigFactory.load("test-reference.conf"))
+          .resolve()).build();
 
   @Test
   public void testConfigParsing() throws IOException {
@@ -134,7 +137,6 @@ public boolean onError(Throwable error) {
 
   @Test
   public void testProxyRandomGet() throws UnsupportedEncodingException, InterruptedException {
-    Repository repo = Repository.Builder.of(ConfigFactory.load().resolve()).build();
     EntityDescriptor proxied = repo.findEntity("proxied").get();
     AttributeDescriptor<?> target = proxied.findAttribute("_e.*", true).get();
     AttributeDescriptor<?> source = proxied.findAttribute("event.*").get();
@@ -165,7 +167,6 @@ public void testProxyRandomGet() throws UnsupportedEncodingException, Interrupte
 
   @Test
   public void testProxyScan() throws UnsupportedEncodingException, InterruptedException {
-    Repository repo = Repository.Builder.of(ConfigFactory.load().resolve()).build();
     EntityDescriptor proxied = repo.findEntity("proxied").get();
     AttributeDescriptor<?> source = proxied.findAttribute("event.*").get();
     Set<AttributeFamilyDescriptor> proxiedFamilies = repo
@@ -206,7 +207,6 @@ public void testProxyScan() throws UnsupportedEncodingException, InterruptedExce
 
   @Test
   public void testProxyCachedView() throws UnsupportedEncodingException {
-    Repository repo = Repository.Builder.of(ConfigFactory.load().resolve()).build();
     EntityDescriptor proxied = repo.findEntity("proxied").get();
     AttributeDescriptor<?> target = proxied.findAttribute("_e.*", true).get();
     AttributeDescriptor<?> source = proxied.findAttribute("event.*").get();

diff --git a/core/src/test/java/cz/o2/proxima/storage/randomaccess/MultiAccessBuilderTest.java b/core/src/test/java/cz/o2/proxima/storage/randomaccess/MultiAccessBuilderTest.java
@@ -39,7 +39,10 @@
  */
 public class MultiAccessBuilderTest {
 
-  final Repository repo = Repository.of(ConfigFactory.load().resolve());
+  final Repository repo = Repository.Builder.of(
+      ConfigFactory.load()
+          .withFallback(ConfigFactory.load("test-reference.conf"))
+          .resolve()).build();
 
   RandomAccessReader reader;
   long now;

diff --git a/core/src/test/resources/reference.conf → core/src/test/resources/test-reference.conf b/core/src/test/resources/reference.conf → core/src/test/resources/test-reference.conf
diff --git a/ingest-server/src/test/java/cz/o2/proxima/server/IngestServiceTest.java b/ingest-server/src/test/java/cz/o2/proxima/server/IngestServiceTest.java
@@ -47,7 +47,10 @@ public class IngestServiceTest {
 
   @Before
   public void setup() throws InterruptedException {
-    server = new IngestServer(ConfigFactory.load().resolve());
+    server = new IngestServer(
+        ConfigFactory.load()
+          .withFallback(ConfigFactory.load("test-reference.conf"))
+          .resolve());
     ingest = server.new IngestService();
     server.startConsumerThreads();
     latch = new CountDownLatch(1);

diff --git a/ingest-server/src/test/java/cz/o2/proxima/server/RetrieveServiceTest.java b/ingest-server/src/test/java/cz/o2/proxima/server/RetrieveServiceTest.java
@@ -41,7 +41,10 @@ public class RetrieveServiceTest {
 
   @Before
   public void setup() throws InterruptedException {
-    server = new IngestServer(ConfigFactory.load().resolve());
+    server = new IngestServer(
+        ConfigFactory.load()
+          .withFallback(ConfigFactory.load("test-reference.conf"))
+          .resolve());
     retrieve = server.new RetrieveService();
     server.startConsumerThreads();
   }