Skip to content
Snippets Groups Projects
Commit f8ec1efa authored by OZGCloud's avatar OZGCloud
Browse files

OZG-14 fix integeration tests - we will run unit-its under surefire

parent f0cef524
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</parent> </parent>
<artifactId>goofy-server</artifactId> <artifactId>goofy-server</artifactId>
<name>goofy server</name> <name>Goofy Server</name>
<description>Projekt packaging deployment artefact</description> <description>Projekt packaging deployment artefact</description>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -77,11 +77,21 @@ ...@@ -77,11 +77,21 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
...@@ -103,30 +113,6 @@ ...@@ -103,30 +113,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>de.itvsh.goofy.GoofyServerApplication</mainClass>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.MockMvc; ...@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.MockMvc;
@SpringBootTest @SpringBootTest
@AutoConfigureMockMvc @AutoConfigureMockMvc
class EnvironmentControllerITCase { class EnvironmentControllerTest {
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;
...@@ -24,7 +24,7 @@ class EnvironmentControllerITCase { ...@@ -24,7 +24,7 @@ class EnvironmentControllerITCase {
@Test @Test
void shouldHaveProductionFalse() throws Exception { void shouldHaveProductionFalse() throws Exception {
mockMvc.perform(get("/api/environment"))// mockMvc.perform(get("/api/environment")).andExpect(status().is2xxSuccessful())//
.andExpect(jsonPath("$.production").value(false)); .andExpect(jsonPath("$.production").value(false));
} }
} }
...@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.MockMvc; ...@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.MockMvc;
@SpringBootTest @SpringBootTest
@AutoConfigureMockMvc @AutoConfigureMockMvc
class RootControllerITCase { class RootControllerTest {
private final String PATH = "/api"; private final String PATH = "/api";
......
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>de.itvsh.ozg</groupId>
<artifactId>goofy</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>goofy-service</artifactId>
<name>goofy-service</name>
<description>Goofy Service</description>
</project>
\ No newline at end of file
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
<!-- plugins --> <!-- plugins -->
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<resources.plugin.version>3.1.0</resources.plugin.version> <resources.plugin.version>3.1.0</resources.plugin.version>
<maven.surefire.version>3.0.0-M5</maven.surefire.version>
<maven.failsafe.version>3.0.0-M5</maven.failsafe.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -72,6 +74,13 @@ ...@@ -72,6 +74,13 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version> <version>${spring.boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -81,17 +90,18 @@ ...@@ -81,17 +90,18 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version> <version>${maven.surefire.version}</version>
<configuration> <configuration>
<argLine> <argLine>
--illegal-access=permit --illegal-access=permit
</argLine> </argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version> <version>${maven.failsafe.version}</version>
<configuration> <configuration>
<argLine> <argLine>
--illegal-access=permit --illegal-access=permit
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment