From ca411ca8964a493f6faf28f27f7168181b626a85 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 21 Jan 2020 16:34:57 +0100 Subject: [PATCH] Revert "TSK-369: Removed unneeded files amd configuration" This reverts commit 26b1d6662779fd484d00e3c3d64256cdc3845df1. --- .travis.yml | 1 + ci/test.sh | 2 +- lib/taskana-cdi-example/pom.xml | 18 ++++++++ .../java/pro/taskana/ExampleBootstrap.java | 14 +++++++ rest/taskana-rest-spring-example-boot/pom.xml | 41 +++++++++++++++++++ .../rest/ExampleRestApplicationTest.java | 14 +++++++ 6 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 lib/taskana-cdi-example/src/test/java/pro/taskana/ExampleBootstrap.java create mode 100644 rest/taskana-rest-spring-example-boot/src/test/pro/taskana/rest/ExampleRestApplicationTest.java diff --git a/.travis.yml b/.travis.yml index f21ed9c5e..26f1fdd18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,7 @@ env: install: skip script: ci/test.sh $DB + before_cache: rm -rf $HOME/.m2/repository/pro/taskana jobs: diff --git a/ci/test.sh b/ci/test.sh index 90bbbc6f1..face59f27 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -35,7 +35,7 @@ function main() { eval "$REL/prepare_db.sh '$1'" # We can not use the fance '-f' maven option due to a bug in arquillian. See https://issues.jboss.org/browse/THORN-2049 #-Pcoverage to activate jacoco and test coverage reports - # send test coverage and build information to sonarcloud + # #send test coverage and build information to sonarcloud (cd $REL/.. \ && mvn -q install -B -T 4C -am -Pcoverage -Dmaven.javadoc.skip -Dcheckstyle.skip \ && mvn sonar:sonar -Pcoverage -Dsonar.projectKey="$SONAR_PROJECT_KEY" diff --git a/lib/taskana-cdi-example/pom.xml b/lib/taskana-cdi-example/pom.xml index cd438f6a7..fcef197ff 100644 --- a/lib/taskana-cdi-example/pom.xml +++ b/lib/taskana-cdi-example/pom.xml @@ -26,5 +26,23 @@ taskana-cdi ${project.version} + + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} + test + diff --git a/lib/taskana-cdi-example/src/test/java/pro/taskana/ExampleBootstrap.java b/lib/taskana-cdi-example/src/test/java/pro/taskana/ExampleBootstrap.java new file mode 100644 index 000000000..9785b25ba --- /dev/null +++ b/lib/taskana-cdi-example/src/test/java/pro/taskana/ExampleBootstrap.java @@ -0,0 +1,14 @@ +package pro.taskana; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** Placeholder test class until we have real tests. */ +class ExampleBootstrap { + + /** TODO add real tests. */ + @Test + void sampleTest() { + Assertions.assertTrue(true); + } +} diff --git a/rest/taskana-rest-spring-example-boot/pom.xml b/rest/taskana-rest-spring-example-boot/pom.xml index 83b42a308..8e1326cc1 100644 --- a/rest/taskana-rest-spring-example-boot/pom.xml +++ b/rest/taskana-rest-spring-example-boot/pom.xml @@ -72,6 +72,47 @@ taskana-rest-spring-example-common ${project.version} + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + org.springframework.ldap + spring-ldap-test + test + + + commons-logging + commons-logging + + + + + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} + test + diff --git a/rest/taskana-rest-spring-example-boot/src/test/pro/taskana/rest/ExampleRestApplicationTest.java b/rest/taskana-rest-spring-example-boot/src/test/pro/taskana/rest/ExampleRestApplicationTest.java new file mode 100644 index 000000000..9a0d03f40 --- /dev/null +++ b/rest/taskana-rest-spring-example-boot/src/test/pro/taskana/rest/ExampleRestApplicationTest.java @@ -0,0 +1,14 @@ +package pro.taskana.rest; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** Placeholder test class until we have real tests. */ +class ExampleRestApplicationTest { + + /** TODO add real tests */ + @Test + void sampleTest() { + Assertions.assertTrue(true); + } +}