From 475c0ec3839034e4b09da9524d635c810408fac5 Mon Sep 17 00:00:00 2001 From: sfrevel <3075075+sfrevel@users.noreply.github.com> Date: Wed, 27 May 2020 14:28:32 +0200 Subject: [PATCH] TSK-1035: moved tests to corresponding taskana-simplehistory-spring-test project TSK-1035: example project now copies the docu from taskana-simplehostory-rest-spring, instead of the of the other way arround --- history/pom.xml | 2 +- .../pom.xml | 3 +- .../taskana-simplehistory-rest-spring/pom.xml | 120 ++++++++++++++++++ .../src/js/jquery-1.11.3.min.js | 0 .../src/js/jquery-ui.min.js | 0 .../src/js/jquery.tocify.min.js | 0 .../src/main/asciidoc/docinfo.html | 0 .../main/asciidoc/simplehistory-rest-api.adoc | 0 .../TaskHistoryEventControllerIntTest.java | 0 ...TaskHistoryEventResourceAssemblerTest.java | 0 ...storyEventControllerRestDocumentation.java | 0 .../rest/ExampleDocumentationApplication.java | 0 .../test}/resources/application.properties | 0 13 files changed, 123 insertions(+), 2 deletions(-) rename history/{taskana-simplehistory-spring-test => taskana-simplehistory-rest-spring}/src/js/jquery-1.11.3.min.js (100%) rename history/{taskana-simplehistory-spring-test => taskana-simplehistory-rest-spring}/src/js/jquery-ui.min.js (100%) rename history/{taskana-simplehistory-spring-test => taskana-simplehistory-rest-spring}/src/js/jquery.tocify.min.js (100%) rename history/{taskana-simplehistory-spring-test => taskana-simplehistory-rest-spring}/src/main/asciidoc/docinfo.html (100%) rename history/{taskana-simplehistory-spring-test => taskana-simplehistory-rest-spring}/src/main/asciidoc/simplehistory-rest-api.adoc (100%) rename history/{taskana-simplehistory-spring-test => taskana-simplehistory-rest-spring}/src/test/java/pro/taskana/TaskHistoryEventControllerIntTest.java (100%) rename history/{taskana-simplehistory-spring-test => taskana-simplehistory-rest-spring}/src/test/java/pro/taskana/TaskHistoryEventResourceAssemblerTest.java (100%) rename history/{taskana-simplehistory-spring-test => taskana-simplehistory-rest-spring}/src/test/java/pro/taskana/doc/api/TaskHistoryEventControllerRestDocumentation.java (100%) rename history/{taskana-simplehistory-spring-test/src/main => taskana-simplehistory-rest-spring/src/test}/java/pro/taskana/rest/ExampleDocumentationApplication.java (100%) rename history/{taskana-simplehistory-spring-test/src/main => taskana-simplehistory-rest-spring/src/test}/resources/application.properties (100%) diff --git a/history/pom.xml b/history/pom.xml index e3b4f0123..fdf79ddce 100644 --- a/history/pom.xml +++ b/history/pom.xml @@ -18,7 +18,7 @@ taskana-simplehistory-provider taskana-simplehistory-rest-spring - taskana-simplehistory-spring-test + taskana-simplehistory-rest-spring-example diff --git a/history/taskana-simplehistory-rest-spring-example/pom.xml b/history/taskana-simplehistory-rest-spring-example/pom.xml index 964e2d205..66b918a08 100644 --- a/history/taskana-simplehistory-rest-spring-example/pom.xml +++ b/history/taskana-simplehistory-rest-spring-example/pom.xml @@ -82,6 +82,7 @@ + org.apache.maven.plugins maven-resources-plugin ${version.maven.resources} @@ -98,7 +99,7 @@ - ${project.build.directory}/generated-docs + ../taskana-simplehistory-rest-spring/target/generated-docs diff --git a/history/taskana-simplehistory-rest-spring/pom.xml b/history/taskana-simplehistory-rest-spring/pom.xml index 5a4c6ad55..fda7dcc6c 100644 --- a/history/taskana-simplehistory-rest-spring/pom.xml +++ b/history/taskana-simplehistory-rest-spring/pom.xml @@ -15,6 +15,18 @@ ../pom.xml + + + + org.springframework.boot + spring-boot-dependencies + ${version.spring.boot} + pom + import + + + + pro.taskana.simplehistory @@ -57,6 +69,114 @@ jackson-databind ${version.jackson} + + + + org.springframework.boot + spring-boot-starter-web + test + + + org.springframework.boot + spring-boot-starter-jdbc + test + + + com.h2database + h2 + ${version.h2} + test + + + org.springframework.plugin + spring-plugin-core + ${version.spring.core} + test + + + + org.assertj + assertj-core + ${version.assertj} + test + + + org.junit.jupiter + junit-jupiter + ${version.junit.jupiter} + test + + + org.springframework + spring-test + test + + + org.springframework.boot + spring-boot-test + test + + + org.springframework.restdocs + spring-restdocs-core + test + + + org.springframework.restdocs + spring-restdocs-mockmvc + test + + + + + + org.asciidoctor + asciidoctor-maven-plugin + ${version.maven.asciidoctor} + + + generate-docs + prepare-package + + process-asciidoc + + + html + book + + target/generated-snippets + shared + + + + + + + maven-resources-plugin + ${version.maven.resources} + + + copy-rest-docs + prepare-package + + copy-resources + + + + ${project.build.directory}/generated-docs + + + + ${project.basedir}/src/js + + + + + + + + + diff --git a/history/taskana-simplehistory-spring-test/src/js/jquery-1.11.3.min.js b/history/taskana-simplehistory-rest-spring/src/js/jquery-1.11.3.min.js similarity index 100% rename from history/taskana-simplehistory-spring-test/src/js/jquery-1.11.3.min.js rename to history/taskana-simplehistory-rest-spring/src/js/jquery-1.11.3.min.js diff --git a/history/taskana-simplehistory-spring-test/src/js/jquery-ui.min.js b/history/taskana-simplehistory-rest-spring/src/js/jquery-ui.min.js similarity index 100% rename from history/taskana-simplehistory-spring-test/src/js/jquery-ui.min.js rename to history/taskana-simplehistory-rest-spring/src/js/jquery-ui.min.js diff --git a/history/taskana-simplehistory-spring-test/src/js/jquery.tocify.min.js b/history/taskana-simplehistory-rest-spring/src/js/jquery.tocify.min.js similarity index 100% rename from history/taskana-simplehistory-spring-test/src/js/jquery.tocify.min.js rename to history/taskana-simplehistory-rest-spring/src/js/jquery.tocify.min.js diff --git a/history/taskana-simplehistory-spring-test/src/main/asciidoc/docinfo.html b/history/taskana-simplehistory-rest-spring/src/main/asciidoc/docinfo.html similarity index 100% rename from history/taskana-simplehistory-spring-test/src/main/asciidoc/docinfo.html rename to history/taskana-simplehistory-rest-spring/src/main/asciidoc/docinfo.html diff --git a/history/taskana-simplehistory-spring-test/src/main/asciidoc/simplehistory-rest-api.adoc b/history/taskana-simplehistory-rest-spring/src/main/asciidoc/simplehistory-rest-api.adoc similarity index 100% rename from history/taskana-simplehistory-spring-test/src/main/asciidoc/simplehistory-rest-api.adoc rename to history/taskana-simplehistory-rest-spring/src/main/asciidoc/simplehistory-rest-api.adoc diff --git a/history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/TaskHistoryEventControllerIntTest.java b/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/TaskHistoryEventControllerIntTest.java similarity index 100% rename from history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/TaskHistoryEventControllerIntTest.java rename to history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/TaskHistoryEventControllerIntTest.java diff --git a/history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/TaskHistoryEventResourceAssemblerTest.java b/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/TaskHistoryEventResourceAssemblerTest.java similarity index 100% rename from history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/TaskHistoryEventResourceAssemblerTest.java rename to history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/TaskHistoryEventResourceAssemblerTest.java diff --git a/history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/doc/api/TaskHistoryEventControllerRestDocumentation.java b/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/doc/api/TaskHistoryEventControllerRestDocumentation.java similarity index 100% rename from history/taskana-simplehistory-spring-test/src/test/java/pro/taskana/doc/api/TaskHistoryEventControllerRestDocumentation.java rename to history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/doc/api/TaskHistoryEventControllerRestDocumentation.java diff --git a/history/taskana-simplehistory-spring-test/src/main/java/pro/taskana/rest/ExampleDocumentationApplication.java b/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/rest/ExampleDocumentationApplication.java similarity index 100% rename from history/taskana-simplehistory-spring-test/src/main/java/pro/taskana/rest/ExampleDocumentationApplication.java rename to history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/rest/ExampleDocumentationApplication.java diff --git a/history/taskana-simplehistory-spring-test/src/main/resources/application.properties b/history/taskana-simplehistory-rest-spring/src/test/resources/application.properties similarity index 100% rename from history/taskana-simplehistory-spring-test/src/main/resources/application.properties rename to history/taskana-simplehistory-rest-spring/src/test/resources/application.properties