From 7d41efdab1092d2141c30d6af64d759038d537ab Mon Sep 17 00:00:00 2001 From: Doha2012 Date: Mon, 13 Nov 2017 09:06:06 +0200 Subject: [PATCH] group testing modules (#2914) * 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 * cleanup --- .../src/main/java/com/baeldung/junit5/Greetings.java | 0 .../src/test/java/com/baeldung/GreetingsTest.java | 2 +- .../baeldung/junit5/spring/GreetingsSpringTest.java | 2 +- .../junit5/spring/SpringTestConfiguration.java | 0 .../src/main/resources/Feature/cucumber.feature | 10 ---------- .../src/main/resources/karate/cucumber.feature | 0 .../java/com/baeldung/rest/karate/KarateUnitTest.java | 0 .../src/test/resources/karate/user.feature | 0 8 files changed, 2 insertions(+), 12 deletions(-) rename {junit5 => testing-modules/junit-5}/src/main/java/com/baeldung/junit5/Greetings.java (100%) rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/GreetingsTest.java (99%) rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java (99%) rename {junit5 => testing-modules/junit-5}/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java (100%) delete mode 100644 testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature rename {rest-testing => testing-modules/rest-testing}/src/main/resources/karate/cucumber.feature (100%) rename {rest-testing => testing-modules/rest-testing}/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java (100%) rename {rest-testing => testing-modules/rest-testing}/src/test/resources/karate/user.feature (100%) diff --git a/junit5/src/main/java/com/baeldung/junit5/Greetings.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/Greetings.java similarity index 100% rename from junit5/src/main/java/com/baeldung/junit5/Greetings.java rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/Greetings.java diff --git a/junit5/src/test/java/com/baeldung/GreetingsTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/GreetingsTest.java similarity index 99% rename from junit5/src/test/java/com/baeldung/GreetingsTest.java rename to testing-modules/junit-5/src/test/java/com/baeldung/GreetingsTest.java index e894d5857c..efde4e7404 100644 --- a/junit5/src/test/java/com/baeldung/GreetingsTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/GreetingsTest.java @@ -16,4 +16,4 @@ public class GreetingsTest { assertTrue("Hello".equals(Greetings.sayHello())); } -} +} \ No newline at end of file diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java similarity index 99% rename from junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java rename to testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java index e7a8a1c1e7..3b89508c88 100644 --- a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java +++ b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java @@ -18,4 +18,4 @@ public class GreetingsSpringTest { assertTrue("Hello".equals(Greetings.sayHello())); } -} +} \ No newline at end of file diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java similarity index 100% rename from junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java rename to testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java diff --git a/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature b/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature deleted file mode 100644 index 99dd8249fe..0000000000 --- a/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature +++ /dev/null @@ -1,10 +0,0 @@ -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 \ No newline at end of file diff --git a/rest-testing/src/main/resources/karate/cucumber.feature b/testing-modules/rest-testing/src/main/resources/karate/cucumber.feature similarity index 100% rename from rest-testing/src/main/resources/karate/cucumber.feature rename to testing-modules/rest-testing/src/main/resources/karate/cucumber.feature diff --git a/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java similarity index 100% rename from rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java diff --git a/rest-testing/src/test/resources/karate/user.feature b/testing-modules/rest-testing/src/test/resources/karate/user.feature similarity index 100% rename from rest-testing/src/test/resources/karate/user.feature rename to testing-modules/rest-testing/src/test/resources/karate/user.feature