Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/#502 consul integrate test #503

Merged
merged 19 commits into from
Jun 14, 2019
Merged

Feat/#502 consul integrate test #503

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5dade37
Fixed the scope caching error
jiachen1120 Apr 18, 2019
ab58c2c
Merge branch 'master' of https://github.com/networknt/light-4j
jiachen1120 Apr 22, 2019
cff9763
Merge branch 'master' of https://github.com/networknt/light-4j
jiachen1120 Apr 29, 2019
7e76801
Added dependence of container test into pom
jiachen1120 Apr 30, 2019
52ef5f3
Moved the test cases to server module
jiachen1120 May 2, 2019
2ad53a5
Enhanced the registry test with testContainer.
jiachen1120 May 6, 2019
27c6826
Merge branch 'master' of https://github.com/networknt/light-4j into f…
jiachen1120 May 6, 2019
a03335c
Migrate consul container test to integration folder
jiachen1120 May 7, 2019
913294c
Reverted unnecessary change
jiachen1120 May 7, 2019
9a16b4f
Changed name
jiachen1120 May 7, 2019
fa5acf8
Disable the integration test for mvn clean install
jiachen1120 May 15, 2019
8640ba7
Merge branch 'master' of https://github.com/networknt/light-4j into f…
jiachen1120 May 15, 2019
411138a
Removed unused line
jiachen1120 May 15, 2019
1e70b4d
-now integration test will copy the config under its own integration …
BalloonWen Jun 10, 2019
7b584f1
-move integration plugins to integration-test profile
BalloonWen Jun 10, 2019
fdc91a1
Merge branch 'master' of github.com:networknt/light-4j into feat/#502…
BalloonWen Jun 10, 2019
764828d
merge from master
stevehu Jun 14, 2019
0a9d076
fixes the typo
stevehu Jun 14, 2019
0133011
update travis to jdk11
stevehu Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ration/resources/config/oauth/primary.crt → .../integration/resources/config/primary.crt
View file
Open in desktop
File renamed without changes.
0 ...ration/resources/config/oauth/primary.jks → .../integration/resources/config/primary.jks
View file
Open in desktop
File renamed without changes.
0 ...tion/resources/config/oauth/secondary.crt → ...ntegration/resources/config/secondary.crt
View file
Open in desktop
File renamed without changes.
0 ...tion/resources/config/oauth/secondary.jks → ...ntegration/resources/config/secondary.jks
View file
Open in desktop
File renamed without changes.
0 ...tion/resources/config/tls/server.keystore → ...egration/resources/config/server.keystore
View file
Open in desktop
File renamed without changes.
0 ...on/resources/config/tls/server.truststore → ...ration/resources/config/server.truststore
View file
Open in desktop
File renamed without changes.
146 changes: 97 additions & 49 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@
<version.error_prone_core>2.0.15</version.error_prone_core>
<version.lifecycle-mapping>1.0.0</version.lifecycle-mapping>
<version.maven-gpg>1.6</version.maven-gpg>
<version.testcontainers>1.8.0</version.testcontainers>
<argLine>-Xmx512m</argLine>
<skip.unit.tests>false</skip.unit.tests>
<matched.test.resources>**/*</matched.test.resources>
</properties>

<modules>
Expand Down Expand Up @@ -467,7 +470,7 @@
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_common</artifactId>
<version>${version.prometheus}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
Expand Down Expand Up @@ -603,6 +606,12 @@
<version>${version.httpclient}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${version.testcontainers}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -623,7 +632,7 @@
<filtering>false</filtering>
<directory>${basedir}/src/test/resources</directory>
<includes>
<include>**/*</include>
<include>${matched.test.resources}</include>
</includes>
</testResource>
</testResources>
Expand Down Expand Up @@ -689,55 +698,14 @@
<version>${version.maven-surefire}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${version.maven-surefire}</version>
<configuration>
<encoding>UTF-8</encoding>
<!-- Skips unit tests if the value of skip.unit.tests property is true -->
<skipTests>${skip.unit.tests}</skipTests>
<!-- Excludes integration tests when unit tests are run -->
<excludes>
<exclude>**/*IT.java</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${version.build-helper-maven}</version>
<executions>
<execution>
<id>add-test-source</id>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>${project.basedir}\src\integration\java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-resource</id>
<goals>
<goal>add-test-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<!-- Don't forget <directory> label -->
<directory>${project.basedir}\src\integration\resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<!-- JACOCO added for code coverage -->
<plugin>
Expand Down Expand Up @@ -882,6 +850,12 @@
<profiles>
<profile>
<id>dev</id>
<properties>
<!--
Only unit tests are run when the development profile is active
-->
<skip.unit.tests>false</skip.unit.tests>
</properties>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -972,5 +946,79 @@
</plugins>
</build>
</profile>
<!-- The Configuration of the integration-test profile -->
<profile>
<id>integration-test</id>
<properties>
<!--
Only integration tests are run when the integration-test profile is active
-->
<skip.unit.tests>true</skip.unit.tests>
<!--to include nothing for regular unit resources-->
<matched.test.resources>a^</matched.test.resources>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${version.maven-surefire}</version>
<executions>
<!--
Invokes both the integration-test and the verify goals of the
Failsafe Maven plugin
-->
<execution>
<id>integration-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<!--
Skips integration tests if the value of skip.integration.tests
property is true
-->
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${version.build-helper-maven}</version>
<executions>
<execution>
<id>add-integration-test-source</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>${project.basedir}/src/integration/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-integration-test-resource</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<!-- Don't forget <directory> label -->
<directory>${project.basedir}/src/integration/resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
5 changes: 5 additions & 0 deletions server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
Loading