Skip to content

Commit

Permalink
chore(travis): Aggregate test coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
ElPicador committed Aug 28, 2017
1 parent 72ef934 commit 6fd7b80
Show file tree
Hide file tree
Showing 85 changed files with 222 additions and 182 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ hs_err_pid*

.idea/
*.iml
.DS_Store
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cache:
maven: true

script:
- "mvn clean test jacoco:report coveralls:report -B"
- "mvn clean test jacoco:report jacoco:report-aggregate -B && mvn -pl algoliasearch-tests coveralls:report -B"

#deploy snapshots
after_success:
Expand Down
18 changes: 0 additions & 18 deletions algoliasearch-appengine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,6 @@
<artifactId>appengine-api-1.0-sdk</artifactId>
<scope>provided</scope>
</dependency>

<!--Test-->
<dependency>
<groupId>com.algolia</groupId>
<artifactId>algoliasearch-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
8 changes: 0 additions & 8 deletions algoliasearch-async/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@
<groupId>net.javacrumbs.future-converter</groupId>
<artifactId>future-converter-java8-guava</artifactId>
</dependency>

<!--Test-->
<dependency>
<groupId>com.algolia</groupId>
<artifactId>algoliasearch-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>

</project>
17 changes: 0 additions & 17 deletions algoliasearch-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,6 @@

<artifactId>algoliasearch-common</artifactId>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

<dependencies>
<dependency>
Expand Down
87 changes: 87 additions & 0 deletions algoliasearch-tests/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.algolia</groupId>
<artifactId>algoliasearch-parent</artifactId>
<version>2.12.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>algoliasearch-tests</artifactId>

<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.2.0</version>
<configuration>
<jacocoReports>
<jacocoReport>target/site/jacoco-aggregate/jacoco.xml</jacocoReport>
</jacocoReports>
<sourceDirectories>
<sourceDirectory>${basedir}/../algoliasearch/src/main/java</sourceDirectory>
<sourceDirectory>${basedir}/../algoliasearch-appengine/src/main/java</sourceDirectory>
<sourceDirectory>${basedir}/../algoliasearch-async/src/main/java</sourceDirectory>
<sourceDirectory>${basedir}/../algoliasearch-common/src/main/java</sourceDirectory>
</sourceDirectories>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
</dependency>
<dependency>
<groupId>com.algolia</groupId>
<artifactId>algoliasearch</artifactId>
</dependency>
<dependency>
<groupId>com.algolia</groupId>
<artifactId>algoliasearch-appengine</artifactId>
</dependency>
<dependency>
<groupId>com.algolia</groupId>
<artifactId>algoliasearch-async</artifactId>
</dependency>
<dependency>
<groupId>com.algolia</groupId>
<artifactId>algoliasearch-common</artifactId>
</dependency>

<!--Test-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncApiKeysTest;
import com.algolia.search.integration.common.sync.SyncApiKeysTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheApiKeysTest extends SyncApiKeysTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncBatchTest;
import com.algolia.search.integration.common.sync.SyncBatchTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheBatchTest extends SyncBatchTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncBrowseTest;
import com.algolia.search.integration.common.sync.SyncBrowseTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheBrowseTest extends SyncBrowseTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncDeleteByTest;
import com.algolia.search.integration.common.sync.SyncDeleteByTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheDeleteByTest extends SyncDeleteByTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncIndicesTest;
import com.algolia.search.integration.common.sync.SyncIndicesTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheIndicesTest extends SyncIndicesTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncLogsTest;
import com.algolia.search.integration.common.sync.SyncLogsTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheLogsTest extends SyncLogsTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncObjectsTest;
import com.algolia.search.integration.common.sync.SyncObjectsTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheObjectsTest extends SyncObjectsTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncPartialUpdateObjectTest;
import com.algolia.search.integration.common.sync.SyncPartialUpdateObjectTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApachePartialUpdateObjectTest extends SyncPartialUpdateObjectTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncRulesTest;
import com.algolia.search.integration.common.sync.SyncRulesTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheRulesTest extends SyncRulesTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncSearchTest;
import com.algolia.search.integration.common.sync.SyncSearchTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheSearchTest extends SyncSearchTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncSettingsTest;
import com.algolia.search.integration.common.sync.SyncSettingsTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheSettingsTest extends SyncSettingsTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.apache;

import com.algolia.search.APIClient;
import com.algolia.search.ApacheAPIClientBuilder;
import com.algolia.search.integration.sync.SyncSynonymsTest;
import com.algolia.search.integration.common.sync.SyncSynonymsTest;
import com.fasterxml.jackson.databind.ObjectMapper;

public class ApacheSynonymsTest extends SyncSynonymsTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.appengine;

import com.algolia.search.APIClient;
import com.algolia.search.AppEngineAPIClientBuilder;
import com.algolia.search.integration.sync.SyncApiKeysTest;
import com.algolia.search.integration.common.sync.SyncApiKeysTest;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.appengine.tools.development.testing.LocalURLFetchServiceTestConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.appengine;

import com.algolia.search.APIClient;
import com.algolia.search.AppEngineAPIClientBuilder;
import com.algolia.search.integration.sync.SyncBatchTest;
import com.algolia.search.integration.common.sync.SyncBatchTest;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.appengine.tools.development.testing.LocalURLFetchServiceTestConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.appengine;

import com.algolia.search.APIClient;
import com.algolia.search.AppEngineAPIClientBuilder;
import com.algolia.search.integration.sync.SyncBrowseTest;
import com.algolia.search.integration.common.sync.SyncBrowseTest;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.appengine.tools.development.testing.LocalURLFetchServiceTestConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.appengine;

import com.algolia.search.APIClient;
import com.algolia.search.AppEngineAPIClientBuilder;
import com.algolia.search.integration.sync.SyncDeleteByTest;
import com.algolia.search.integration.common.sync.SyncDeleteByTest;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.appengine.tools.development.testing.LocalURLFetchServiceTestConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.appengine;

import com.algolia.search.APIClient;
import com.algolia.search.AppEngineAPIClientBuilder;
import com.algolia.search.integration.sync.SyncIndicesTest;
import com.algolia.search.integration.common.sync.SyncIndicesTest;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.appengine.tools.development.testing.LocalURLFetchServiceTestConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.appengine;

import com.algolia.search.APIClient;
import com.algolia.search.AppEngineAPIClientBuilder;
import com.algolia.search.integration.sync.SyncLogsTest;
import com.algolia.search.integration.common.sync.SyncLogsTest;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.appengine.tools.development.testing.LocalURLFetchServiceTestConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.appengine;

import com.algolia.search.APIClient;
import com.algolia.search.AppEngineAPIClientBuilder;
import com.algolia.search.integration.sync.SyncObjectsTest;
import com.algolia.search.integration.common.sync.SyncObjectsTest;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.appengine.tools.development.testing.LocalURLFetchServiceTestConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.algolia.search.integration;
package com.algolia.search.integration.appengine;

import com.algolia.search.APIClient;
import com.algolia.search.AppEngineAPIClientBuilder;
import com.algolia.search.integration.sync.SyncPartialUpdateObjectTest;
import com.algolia.search.integration.common.sync.SyncPartialUpdateObjectTest;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.appengine.tools.development.testing.LocalURLFetchServiceTestConfig;
Expand Down
Loading

0 comments on commit 6fd7b80

Please sign in to comment.