Skip to content

Commit 716e4b3

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 4b0e8ae commit 716e4b3

20 files changed

+493
-24
lines changed

‎src/test/java/org/woehlke/java/simpleworklist/domain/UserRegistrationControllerIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void testSignInFormularEmail() throws Exception {
138138
public void testSignInFormularAccount() throws Exception {
139139
this.mockMvc.perform(
140140
get("/user/register/confirm/ASDF")).andDo(print())
141-
.andExpect(view().name(containsString("user/register/registerNotConfirmed")));
141+
.andExpect(view().name(containsString("user/register/registerConfirmFailed")));
142142
}
143143

144144
@Test
@@ -157,8 +157,8 @@ public void testRegisterNewUserCheckResponseAndRegistrationForm() throws Excepti
157157
String url = "/user/register/confirm/"+o.getToken();
158158
this.mockMvc.perform(
159159
get(url)).andDo(print())
160-
.andExpect(view().name(containsString("user/register/registerConfirmed")))
161-
.andExpect(model().attributeExists("userAccountFormBean"));
160+
.andExpect(view().name(containsString("user/register/registerConfirmForm")))
161+
.andExpect(model().attributeExists("userAccountForm"));
162162
userAccountRegistrationService.registrationUserCreated(o);
163163
}
164164

‎src/test/java/org/woehlke/java/simpleworklist/domain/db/user/ChatMessageServiceIT.java‎

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,93 @@
11
package org.woehlke.java.simpleworklist.domain.db.user;
22

33
import lombok.extern.slf4j.Slf4j;
4+
import org.junit.jupiter.api.*;
5+
import org.springframework.beans.factory.annotation.Autowired;
6+
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
7+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
8+
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
49
import org.springframework.boot.test.context.SpringBootTest;
10+
import org.springframework.boot.web.server.LocalServerPort;
11+
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
12+
import org.springframework.context.annotation.Import;
13+
import org.springframework.security.core.context.SecurityContextHolder;
14+
import org.springframework.test.web.servlet.MockMvc;
15+
import org.woehlke.java.simpleworklist.SimpleworklistApplication;
16+
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
17+
import org.woehlke.java.simpleworklist.config.UserAccountTestDataService;
18+
import org.woehlke.java.simpleworklist.config.WebMvcConfig;
19+
import org.woehlke.java.simpleworklist.config.WebSecurityConfig;
20+
21+
import java.net.URL;
22+
523

624
@Slf4j
7-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
25+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
26+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
27+
@AutoConfigureMockMvc
28+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
29+
@Import(SimpleworklistApplication.class)
30+
@ImportAutoConfiguration({
31+
WebMvcConfig.class,
32+
WebSecurityConfig.class
33+
})
34+
@EnableConfigurationProperties({
35+
SimpleworklistProperties.class
36+
})
837
public class ChatMessageServiceIT {
38+
39+
@Autowired
40+
private ServletWebServerApplicationContext server;
41+
42+
@Autowired
43+
private MockMvc mockMvc;
44+
45+
@SuppressWarnings("deprecation")
46+
@LocalServerPort
47+
private int port;
48+
49+
@Autowired
50+
private UserAccountTestDataService userAccountTestDataService;
51+
52+
private final String eyecatcherH1 = "##################################################################";
53+
private final String eyecatcherH2 = "------------------------------------------------------------------";
54+
private final String eyecatcherH3 = "******************************************************************";
55+
56+
@BeforeEach
57+
public void setUp() throws Exception {
58+
log.info(eyecatcherH1);
59+
log.info(" @BeforeEach setUp()");
60+
log.info(eyecatcherH2);
61+
62+
//userAccountTestDataService.setUp();
63+
log.info(eyecatcherH1);
64+
}
65+
66+
@BeforeAll
67+
public void runBeforeTestClass() throws Exception {
68+
log.info(eyecatcherH1);
69+
log.info(" @BeforeTestClass runBeforeTestClass");
70+
log.info(eyecatcherH2);
71+
URL base = new URL("http://localhost:" + port + "/");
72+
log.info(" Server URL: " + base.toString());
73+
log.info(eyecatcherH2);
74+
userAccountTestDataService.setUp();
75+
log.info(eyecatcherH2);
76+
log.info(" @BeforeTestClass runBeforeTestClass");
77+
log.info(eyecatcherH1);
78+
}
79+
80+
@AfterAll
81+
public void runAfterTestClass() throws Exception {
82+
log.info(eyecatcherH1);
83+
log.info(" @AfterTestClass clearContext");
84+
log.info(eyecatcherH2);
85+
URL base = new URL("http://localhost:" + port + "/");
86+
log.info(" Server URL: " + base.toString());
87+
log.info(eyecatcherH2);
88+
SecurityContextHolder.clearContext();
89+
log.info(eyecatcherH1);
90+
}
91+
92+
993
}

‎src/test/java/org/woehlke/java/simpleworklist/domain/db/user/TokenGeneratorServiceIT.java‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
11
package org.woehlke.java.simpleworklist.domain.db.user;
22

33
import lombok.extern.slf4j.Slf4j;
4+
import org.junit.jupiter.api.MethodOrderer;
5+
import org.junit.jupiter.api.TestInstance;
6+
import org.junit.jupiter.api.TestMethodOrder;
7+
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
8+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
9+
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
410
import org.springframework.boot.test.context.SpringBootTest;
11+
import org.springframework.context.annotation.Import;
12+
import org.woehlke.java.simpleworklist.SimpleworklistApplication;
13+
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
14+
import org.woehlke.java.simpleworklist.config.WebMvcConfig;
15+
import org.woehlke.java.simpleworklist.config.WebSecurityConfig;
516

617
@Slf4j
7-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
18+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
19+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
20+
@AutoConfigureMockMvc
21+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
22+
@Import(SimpleworklistApplication.class)
23+
@ImportAutoConfiguration({
24+
WebMvcConfig.class,
25+
WebSecurityConfig.class
26+
})
27+
@EnableConfigurationProperties({
28+
SimpleworklistProperties.class
29+
})
830
public class TokenGeneratorServiceIT {
931
}

‎src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountPasswordEncodedIntegrationTest.java‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,40 @@
22

33

44
import lombok.extern.slf4j.Slf4j;
5+
import org.junit.jupiter.api.MethodOrderer;
56
import org.junit.jupiter.api.Test;
7+
import org.junit.jupiter.api.TestInstance;
8+
import org.junit.jupiter.api.TestMethodOrder;
9+
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
10+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
11+
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
612
import org.springframework.boot.test.context.SpringBootTest;
13+
import org.springframework.context.annotation.Import;
714
import org.springframework.security.crypto.password.PasswordEncoder;
815

916
import org.springframework.beans.factory.annotation.Autowired;
17+
import org.woehlke.java.simpleworklist.SimpleworklistApplication;
18+
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
19+
import org.woehlke.java.simpleworklist.config.WebMvcConfig;
20+
import org.woehlke.java.simpleworklist.config.WebSecurityConfig;
1021
import org.woehlke.java.simpleworklist.domain.db.user.account.UserAccountForm;
1122

1223
import static org.junit.jupiter.api.Assertions.*;
1324

1425

1526
@Slf4j
16-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
27+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
28+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
29+
@AutoConfigureMockMvc
30+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
31+
@Import(SimpleworklistApplication.class)
32+
@ImportAutoConfiguration({
33+
WebMvcConfig.class,
34+
WebSecurityConfig.class
35+
})
36+
@EnableConfigurationProperties({
37+
SimpleworklistProperties.class
38+
})
1739
public class UserAccountPasswordEncodedIntegrationTest {
1840

1941
@Autowired

‎src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountPasswordRecoveryServiceIT.java‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
package org.woehlke.java.simpleworklist.domain.db.user;
22

33
import lombok.extern.slf4j.Slf4j;
4+
import org.junit.jupiter.api.MethodOrderer;
45
import org.junit.jupiter.api.Test;
6+
import org.junit.jupiter.api.TestInstance;
7+
import org.junit.jupiter.api.TestMethodOrder;
58
import org.springframework.beans.factory.annotation.Autowired;
9+
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
10+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
11+
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
612
import org.springframework.boot.test.context.SpringBootTest;
713
import org.springframework.boot.web.server.LocalServerPort;
814
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
15+
import org.springframework.context.annotation.Import;
916
import org.springframework.test.web.servlet.MockMvc;
17+
import org.woehlke.java.simpleworklist.SimpleworklistApplication;
18+
import org.woehlke.java.simpleworklist.application.helper.TestHelperService;
19+
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
20+
import org.woehlke.java.simpleworklist.config.WebMvcConfig;
21+
import org.woehlke.java.simpleworklist.config.WebSecurityConfig;
1022
import org.woehlke.java.simpleworklist.domain.db.user.passwordrecovery.UserAccountPasswordRecoveryService;
1123
import org.woehlke.java.simpleworklist.domain.db.user.passwordrecovery.UserAccountPasswordRecoveryStatus;
1224

@@ -21,12 +33,26 @@
2133
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
2234

2335
@Slf4j
24-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
36+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
37+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
38+
@AutoConfigureMockMvc
39+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
40+
@Import(SimpleworklistApplication.class)
41+
@ImportAutoConfiguration({
42+
WebMvcConfig.class,
43+
WebSecurityConfig.class
44+
})
45+
@EnableConfigurationProperties({
46+
SimpleworklistProperties.class
47+
})
2548
public class UserAccountPasswordRecoveryServiceIT {
2649

2750
@Autowired
2851
private ServletWebServerApplicationContext server;
2952

53+
@Autowired
54+
private TestHelperService testHelperService;
55+
3056
@Autowired
3157
private MockMvc mockMvc;
3258

‎src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountPasswordServiceIT.java‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
11
package org.woehlke.java.simpleworklist.domain.db.user;
22

33
import lombok.extern.slf4j.Slf4j;
4+
import org.junit.jupiter.api.MethodOrderer;
5+
import org.junit.jupiter.api.TestInstance;
6+
import org.junit.jupiter.api.TestMethodOrder;
7+
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
8+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
9+
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
410
import org.springframework.boot.test.context.SpringBootTest;
11+
import org.springframework.context.annotation.Import;
12+
import org.woehlke.java.simpleworklist.SimpleworklistApplication;
13+
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
14+
import org.woehlke.java.simpleworklist.config.WebMvcConfig;
15+
import org.woehlke.java.simpleworklist.config.WebSecurityConfig;
516

617
@Slf4j
7-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
18+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
19+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
20+
@AutoConfigureMockMvc
21+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
22+
@Import(SimpleworklistApplication.class)
23+
@ImportAutoConfiguration({
24+
WebMvcConfig.class,
25+
WebSecurityConfig.class
26+
})
27+
@EnableConfigurationProperties({
28+
SimpleworklistProperties.class
29+
})
830
public class UserAccountPasswordServiceIT {
931
}

‎src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountRegistrationServiceIT.java‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
11
package org.woehlke.java.simpleworklist.domain.db.user;
22

33
import lombok.extern.slf4j.Slf4j;
4+
import org.junit.jupiter.api.MethodOrderer;
5+
import org.junit.jupiter.api.TestInstance;
6+
import org.junit.jupiter.api.TestMethodOrder;
7+
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
8+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
9+
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
410
import org.springframework.boot.test.context.SpringBootTest;
11+
import org.springframework.context.annotation.Import;
12+
import org.woehlke.java.simpleworklist.SimpleworklistApplication;
13+
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
14+
import org.woehlke.java.simpleworklist.config.WebMvcConfig;
15+
import org.woehlke.java.simpleworklist.config.WebSecurityConfig;
516

617
@Slf4j
7-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
18+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
19+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
20+
@AutoConfigureMockMvc
21+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
22+
@Import(SimpleworklistApplication.class)
23+
@ImportAutoConfiguration({
24+
WebMvcConfig.class,
25+
WebSecurityConfig.class
26+
})
27+
@EnableConfigurationProperties({
28+
SimpleworklistProperties.class
29+
})
830
public class UserAccountRegistrationServiceIT {
931
}

‎src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountServiceIT.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,18 @@
4141

4242

4343
@Slf4j
44-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
44+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
45+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
46+
@AutoConfigureMockMvc
47+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
48+
@Import(SimpleworklistApplication.class)
49+
@ImportAutoConfiguration({
50+
WebMvcConfig.class,
51+
WebSecurityConfig.class
52+
})
53+
@EnableConfigurationProperties({
54+
SimpleworklistProperties.class
55+
})
4556
public class UserAccountServiceIT {
4657

4758
@Autowired

‎src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserRegistrationServiceIT.java‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
package org.woehlke.java.simpleworklist.domain.db.user;
22

33
import lombok.extern.slf4j.Slf4j;
4+
import org.junit.jupiter.api.MethodOrderer;
45
import org.junit.jupiter.api.Test;
6+
import org.junit.jupiter.api.TestInstance;
7+
import org.junit.jupiter.api.TestMethodOrder;
58
import org.springframework.beans.factory.annotation.Value;
9+
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
10+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
11+
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
612
import org.springframework.boot.test.context.SpringBootTest;
13+
import org.springframework.context.annotation.Import;
14+
import org.woehlke.java.simpleworklist.SimpleworklistApplication;
715
import org.woehlke.java.simpleworklist.application.helper.TestHelperService;
16+
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
17+
import org.woehlke.java.simpleworklist.config.WebMvcConfig;
18+
import org.woehlke.java.simpleworklist.config.WebSecurityConfig;
819
import org.woehlke.java.simpleworklist.domain.db.user.passwordrecovery.UserAccountPasswordRecoveryService;
920

1021
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +27,18 @@
1627
import static org.junit.jupiter.api.Assertions.*;
1728

1829
@Slf4j
19-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
30+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
31+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
32+
@AutoConfigureMockMvc
33+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
34+
@Import(SimpleworklistApplication.class)
35+
@ImportAutoConfiguration({
36+
WebMvcConfig.class,
37+
WebSecurityConfig.class
38+
})
39+
@EnableConfigurationProperties({
40+
SimpleworklistProperties.class
41+
})
2042
public class UserRegistrationServiceIT {
2143

2244
@Value("${worklist.registration.max.retries}")

0 commit comments

Comments
 (0)