updated tests

Author: yassine

.travis.yml

@@ -12,19 +12,15 @@ jobs:
   include:
     - stage: test
       script:
-        - mvn clean test post-integration-test
-    - stage: quality-report
-      script:
-        - mvn sonar:sonar -Dsonar.projectKey=yassine_ipdata-java-client
-    - stage: package
+        - mvn clean test post-integration-test sonar:sonar
+    - stage: release
       script:
         - openssl enc -aes-256-cbc -d -in ./.travis/ipdata-java.crypted.gpg.key -out ./.travis/ipdata.out.key -base64 -K $GPG_AES_KEY -iv $GPG_AES_KEY_IV -S $GPG_AES_KEY_SALT
         - echo $GPG_PASSPHRASE | gpg --import --batch --yes --passphrase-fd 0 ./.travis/ipdata.out.key
         - mvn package verify -Prelease -DskipTests=true -Dgpg.keyname=$GPG_KEY_NAME -Dgpg.passphrase=$GPG_PASSPHRASE
 stages:
   - test
-  - quality-report
-  - name: package
+  - name: release
     if: branch = releases
 notifications:
   email: false

pom.groovy

@@ -28,7 +28,7 @@ project {
     'version.build.jacoco' '0.8.4'
     'version.build.surefire' '3.0.0-M3'
     'sonar.organization' 'yassine-github'
-    'sonar.coverage.jacoco.xmlReportPaths' 'target/site/code-coverage/jacoco.xml'
+    'sonar.coverage.jacoco.xmlReportPaths' '${project.build.directory}/site/code-coverage/jacoco.xml'
     'sonar.links.homepage' 'https://github.com/yassine/ipdata-java-client'
     'sonar.links.issue' 'https://github.com/yassine/ipdata-java-client'
     'sonar.links.scm' 'https://github.com/yassine/ipdata-java-client'

src/test/java/io/ipdata/client/IpdataFunctionalTest.java

@@ -110,15 +110,15 @@ public void testCurrency() {
   @Test
   @SneakyThrows
   public void testFieldSelection() {
-    IpdataModel ipdataModel = ipdataService.getFields("8.8.8.8", IpdataField.ASN, IpdataField.CURRENCY);
+    IpdataModel ipdataModel = ipdataService.getFields("41.128.21.123", IpdataField.ASN, IpdataField.CURRENCY);
     String serialized = MAPPER.writeValueAsString(ipdataModel);
-    String expected = TestUtils.get(HTTP_CLIENT, "/8.8.8.8", ImmutableMap.of("fields", "asn,currency"));
+    String expected = TestUtils.get(HTTP_CLIENT, "/41.128.21.123", ImmutableMap.of("fields", "asn,currency"));
     expected = MAPPER.writeValueAsString(MAPPER.readValue(expected, IpdataModel.class));
     assertEquals(serialized, expected, false);
     Assert.assertNull(ipdataModel.threat());
     if (ipdataService == CACHING_IPDATA_SERVICE) {
       //value will be returned from cache now
-      ipdataModel = ipdataService.getFields("8.8.8.8", IpdataField.ASN, IpdataField.CURRENCY);
+      ipdataModel = ipdataService.getFields("41.128.21.123", IpdataField.ASN, IpdataField.CURRENCY, IpdataField.CARRIER);
       serialized = MAPPER.writeValueAsString(ipdataModel);
       assertEquals(serialized, expected, false);
     }