diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index 95de836d..537d1cfc 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -1,17 +1,20 @@ 4.0.0 - wise-webapp - WiseMapping Webapp - http://www.wisemapping.org - 5.1.0-SNAPSHOT - org.springframework.boot spring-boot-starter-parent - 3.1.2 + 3.2.1 + + org.wisemapping + wise-webapp + 5.1.0-SNAPSHOT + + WiseMapping Webapp + http://www.wisemapping.org + 5.1.0-SNAPSHOT 17 @@ -42,6 +45,35 @@ org.springframework.boot spring-boot-starter-tomcat + + org.springframework.boot + spring-boot-test + test + + + junit + junit + + + + + org.springframework + spring-test + 6.1.3 + test + + + org.junit.jupiter + junit-jupiter-api + 5.9.2 + test + + + org.junit.jupiter + junit-jupiter-engine + 5.9.2 + test + org.springframework.boot spring-boot-starter-security @@ -54,13 +86,6 @@ org.springframework.boot spring-boot-starter-mail - - - org.testng - testng - 7.7.0 - test - com.intellij annotations @@ -78,18 +103,6 @@ postgresql 42.5.4 - - - - - - - - - - - - org.springframework.security spring-security-taglibs @@ -199,6 +212,10 @@ + + org.springframework.boot + spring-boot-maven-plugin + org.apache.maven.plugins maven-war-plugin @@ -239,118 +256,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.jacoco - jacoco-maven-plugin - 0.8.10 - - - default-prepare-agent - - prepare-agent - - - - default-prepare-agent-integration - pre-integration-test - - prepare-agent-integration - - - - **/*Test* - - integrationTestArgLine - - - - - default-check - verify - - check - - - - - BUNDLE - - - COMPLEXITY - COVEREDRATIO - 0.10 - - - - - - - - default-report - verify - - report - - - - - - - org.eclipse.jetty - jetty-maven-plugin - 11.0.15 - - - 8080 - - -Ddatabase.base.url=${project.build.directory} -Djetty.port=8080 - 9999 - FORK - foo - - ${project.build.directory}/wisemapping.war - ${project.basedir}/webdefault.xml - - - - - run-forked - pre-integration-test - - start-war - - - true - - - - stop-jetty - post-integration-test - - stop - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - \ No newline at end of file diff --git a/wise-webapp/src/main/java/com/wisemapping/config/common/CommonConfig.java b/wise-webapp/src/main/java/com/wisemapping/config/common/CommonConfig.java index c3bfc4b7..6b2ec206 100644 --- a/wise-webapp/src/main/java/com/wisemapping/config/common/CommonConfig.java +++ b/wise-webapp/src/main/java/com/wisemapping/config/common/CommonConfig.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; @Configuration -@ImportResource(value = {"spring/wisemapping-mail.xml"}) +@ImportResource(value = {"classpath:spring/wisemapping-mail.xml"}) @ComponentScan({"com.wisemapping.security", "com.wisemapping.service", "com.wisemapping.dao", "com.wisemapping.util", "com.wisemapping.model"}) public class CommonConfig { } diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/SmokeTest.java b/wise-webapp/src/test/java/com/wisemapping/test/rest/SmokeTest.java new file mode 100644 index 00000000..9f686a12 --- /dev/null +++ b/wise-webapp/src/test/java/com/wisemapping/test/rest/SmokeTest.java @@ -0,0 +1,26 @@ +package com.wisemapping.test.rest; + + +import com.wisemapping.config.Application; +import com.wisemapping.rest.MindmapController; +import org.junit.jupiter.api.Test; + +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit.jupiter.SpringExtension; + + +@SpringBootTest(classes = Application.class) +@ExtendWith(SpringExtension.class) + +class SmokeTest { + + @Autowired + private MindmapController controller; + + @Test + void contextLoads() throws Exception { + if(controller==null) throw new IllegalStateException(); + } +} \ No newline at end of file