Skip to content

Commit

Permalink
Group testing modules (#3014)
Browse files Browse the repository at this point in the history
* move security content from spring-security-rest-full

* swagger update

* move query language to new module

* rename spring-security-rest-full to spring-rest-full

* group persistence modules

* group testing modules

* try fix conflict
  • Loading branch information
pivovarit committed Nov 12, 2017
1 parent b383d83 commit 776a014
Show file tree
Hide file tree
Showing 236 changed files with 37 additions and 18 deletions.
24 changes: 12 additions & 12 deletions pom.xml
Expand Up @@ -62,10 +62,10 @@
<module>feign</module>
<module>flyway</module>

<!-- <module>gatling</module> --> <!-- not meant to run as part of the standard build -->
<!-- <module>testing-modules/gatling</module> --> <!-- not meant to run as part of the standard build -->

<module>geotools</module>
<module>groovy-spock</module>
<module>testing-modules/groovy-spock</module>
<module>gson</module>
<module>guava</module>
<module>guava18</module>
Expand Down Expand Up @@ -98,7 +98,7 @@
<module>json-path</module>
<module>json</module>
<module>jsoup</module>
<module>junit5</module>
<module>testing-modules/junit-5</module>
<module>jws</module>

<module>libraries</module>
Expand All @@ -112,9 +112,9 @@
<module>mapstruct</module>
<module>metrics</module>
<module>mesos-marathon</module>
<module>mockito</module>
<module>mockito2</module>
<module>mocks</module>
<module>testing-modules/mockito</module>
<module>testing-modules/mockito-2</module>
<module>testing-modules/mocks</module>
<module>mustache</module>
<module>noexception</module>

Expand All @@ -129,13 +129,13 @@
<!-- <module>raml</module> -->
<module>reactor-core</module>
<module>persistence-modules/redis</module>
<module>rest-assured</module>
<module>rest-testing</module>
<module>testing-modules/rest-assured</module>
<module>testing-modules/rest-testing</module>
<module>resteasy</module>
<module>rxjava</module>
<module>spring-swagger-codegen</module>

<module>selenium-junit-testng</module>
<module>testing-modules/selenium-junit-testng</module>
<module>persistence-modules/solr</module>
<module>spark-java</module>
<!-- <module>spring-5</module>-->
Expand Down Expand Up @@ -235,8 +235,8 @@
<module>spring-rest-embedded-tomcat</module>


<module>testing</module>
<module>testng</module>
<module>testing-modules/testing</module>
<module>testing-modules/testng</module>

<module>video-tutorials</module>

Expand All @@ -254,7 +254,7 @@
<module>drools</module>
<module>persistence-modules/liquibase</module>
<module>spring-boot-property-exp</module>
<module>mockserver</module>
<module>testing-modules/mockserver</module>
<module>undertow</module>
<module>vertx-and-rxjava</module>
<module>saas</module>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -17,6 +17,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<build>
Expand Down
File renamed without changes.
5 changes: 3 additions & 2 deletions junit5/pom.xml → testing-modules/junit-5/pom.xml
Expand Up @@ -4,16 +4,17 @@
<modelVersion>4.0.0</modelVersion>

<!-- NOT NEEDED - JSP <groupId>com.baeldung</groupId>-->
<artifactId>junit5</artifactId>
<artifactId>junit-5</artifactId>
<version>1.0-SNAPSHOT</version>

<name>junit5</name>
<name>junit-5</name>
<description>Intro to JUnit 5</description>

<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<properties>
Expand Down
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion mockito2/pom.xml → testing-modules/mockito-2/pom.xml
Expand Up @@ -3,7 +3,7 @@

<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>mockito2</artifactId>
<artifactId>mockito-2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>mockito-2-with-java8</name>
Expand All @@ -12,6 +12,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<profiles>
Expand Down
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions mockito/pom.xml → testing-modules/mockito/pom.xml
Expand Up @@ -11,6 +11,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -6,7 +6,7 @@
<groupId>com.baeldung</groupId>
<artifactId>mocks</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../</relativePath>
</parent>

<artifactId>jmockit</artifactId>
Expand Down
File renamed without changes.
Expand Up @@ -6,7 +6,7 @@
<groupId>com.baeldung</groupId>
<artifactId>mocks</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../</relativePath>
</parent>

<artifactId>mock-comparisons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mocks/pom.xml → testing-modules/mocks/pom.xml
Expand Up @@ -6,7 +6,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../</relativePath>
</parent>

<artifactId>mocks</artifactId>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -10,6 +10,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -11,6 +11,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
@@ -0,0 +1,10 @@
Feature: Testing a REST API
Users should be able to submit GET and POST requests to a web service, represented by WireMock

Scenario: Data Upload to a web service
When users upload data on a project
Then the server should handle it and return a success status

Scenario: Data retrieval from a web service
When users want to get information on the Cucumber project
Then the requested data is returned
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -9,6 +9,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<build>
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions testing/pom.xml → testing-modules/testing/pom.xml
Expand Up @@ -10,6 +10,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions testng/pom.xml → testing-modules/testng/pom.xml
Expand Up @@ -11,6 +11,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 776a014

Please sign in to comment.