feat: integration test

tokenmill · May 29, 2019 · 71e6363 · 71e6363
1 parent b823410
commit 71e6363
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -30,8 +30,18 @@ prepare-base-elasticsearch:
     - docker rmi registry.gitlab.com/tokenmill/crawling-framework/elasticsearch:latest
 
 unit-tests:
-  image: registry.gitlab.com/tokenmill/crawling-framework/base:latest
   stage: test
+  image: registry.gitlab.com/tokenmill/crawling-framework/base:latest
   when: always
   script:
     - mvn clean test
+
+integration-tests:
+  stage: test
+  image: registry.gitlab.com/tokenmill/crawling-framework/base:latest
+  services:
+    - name: registry.gitlab.com/tokenmill/crawling-framework/elasticsearch:latest
+      alias: elasticsearch
+  when: always
+  script:
+    - mvn -Dtest=*TestInt clean test
diff --git a/.../crawling/es/EsHttpUrlOperationsTest.java → ...awling/es/EsHttpUrlOperationsTestInt.java b/.../crawling/es/EsHttpUrlOperationsTest.java → ...awling/es/EsHttpUrlOperationsTestInt.java
@@ -1,7 +1,6 @@
 package lt.tokenmill.crawling.es;
 
 import lt.tokenmill.crawling.data.HttpUrl;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,19 +10,18 @@
 
 import static junit.framework.TestCase.assertTrue;
 
-public class EsHttpUrlOperationsTest {
+public class EsHttpUrlOperationsTestInt {
 
-    private static final Logger LOG = LoggerFactory.getLogger(EsHttpUrlOperationsTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EsHttpUrlOperationsTestInt.class);
 
-    private static final String ES_TEST_HOST = "127.0.0.1";
+    private static final String ES_TEST_HOST = "elasticsearch";
     private static final int ES_HTTP_TEST_PORT = 9200;
     private static final String ES_REST_TEST_SCHEME = "http";
-    private static final String INDEX_ALIAS = "demo-urls";
+    private static final String INDEX_ALIAS = "urls";
     private static final String DOC_TYPE = "url";
 
 
     @Test
-    @Ignore
     public void testEsHttpSourceOperations000() throws IOException, InterruptedException {
         ElasticConnection connection = ElasticConnection.getConnection(ES_TEST_HOST, ES_HTTP_TEST_PORT, ES_REST_TEST_SCHEME);
         EsHttpUrlOperations esHttpUrlOperations = EsHttpUrlOperations.getInstance(connection, INDEX_ALIAS, DOC_TYPE);