Skip to content

Commit 29d1d14

Browse files
author
Alexander Bainczyk
committed
remove @Inject annotation in tests
1 parent 2991ec1 commit 29d1d14

File tree

11 files changed

+101
-196
lines changed

11 files changed

+101
-196
lines changed

‎backend/src/test/java/de/learnlib/alex/auth/entities/UserTest.java‎

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
package de.learnlib.alex.auth.entities;
1818

1919
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertFalse;
2120
import static org.junit.jupiter.api.Assertions.assertThrows;
22-
import static org.junit.jupiter.api.Assertions.assertTrue;
2321

2422
import com.fasterxml.jackson.core.JsonProcessingException;
2523
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -31,6 +29,9 @@
3129
import org.json.JSONException;
3230
import org.junit.jupiter.api.BeforeAll;
3331
import org.junit.jupiter.api.Test;
32+
import org.junit.jupiter.params.ParameterizedTest;
33+
import org.junit.jupiter.params.provider.CsvSource;
34+
import org.junit.jupiter.params.provider.ValueSource;
3435
import org.skyscreamer.jsonassert.JSONAssert;
3536

3637
public class UserTest {
@@ -48,24 +49,15 @@ public void shouldInitializeUserWithDefaultRole() {
4849
assertEquals(user.getRole(), UserRole.REGISTERED);
4950
}
5051

51-
@Test
52-
public void shouldNotLeakPasswordWhenSerialized() throws JsonProcessingException {
53-
final User user = new User();
54-
user.setSalt("salt");
55-
user.setPassword("password");
56-
57-
final String userString = om.writeValueAsString(user);
58-
assertThrows(PathNotFoundException.class, () -> JsonPath.read(userString, "$.password"));
59-
}
60-
61-
@Test
62-
public void shouldNotLeakSaltWhenSerialized() throws JsonProcessingException {
52+
@ParameterizedTest(name = "Use the value {0} for the test")
53+
@ValueSource(strings = { "password", "salt" })
54+
public void shouldNotLeakSensibleDataWhenSerialized(String property) throws JsonProcessingException {
6355
final User user = new User();
6456
user.setSalt("salt");
6557
user.setPassword("password");
6658

6759
final String userString = om.writeValueAsString(user);
68-
assertThrows(PathNotFoundException.class, () -> JsonPath.read(userString, "$.salt"));
60+
assertThrows(PathNotFoundException.class, () -> JsonPath.read(userString, "$." + property));
6961
}
7062

7163
@Test
@@ -120,21 +112,15 @@ public void shouldNotSerializeWebhooks() {
120112
});
121113
}
122114

123-
@Test
124-
public void shouldVerifyPasswordCorrectly() {
125-
final User user = new User();
115+
@ParameterizedTest(name = "Use values \"{0}, {1}\" for the test")
116+
@CsvSource({
117+
"password123, true",
118+
"Password123, false"
119+
})
120+
public void shouldVerifyPassword(String password, boolean valid) {
121+
final var user = new User();
126122
user.setPassword("password123");
127123
user.setEncryptedPassword("password123");
128-
129-
assertTrue(user.isValidPassword("password123"));
130-
}
131-
132-
@Test
133-
public void shouldFailWhenPasswordIsNotCorrect() {
134-
final User user = new User();
135-
user.setPassword("password123");
136-
user.setEncryptedPassword("password123");
137-
138-
assertFalse(user.isValidPassword("Password123"));
124+
assertEquals(valid, user.isValidPassword(password));
139125
}
140126
}

‎backend/src/test/java/de/learnlib/alex/data/entities/actions/misc/AssertCounterActionTest.java‎

Lines changed: 47 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package de.learnlib.alex.data.entities.actions.misc;
1818

1919
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertFalse;
2120
import static org.junit.jupiter.api.Assertions.assertTrue;
2221
import static org.mockito.BDDMockito.given;
2322
import static org.mockito.Mockito.mock;
@@ -33,6 +32,8 @@
3332
import org.junit.jupiter.api.BeforeEach;
3433
import org.junit.jupiter.api.Test;
3534
import org.junit.jupiter.api.extension.ExtendWith;
35+
import org.junit.jupiter.params.ParameterizedTest;
36+
import org.junit.jupiter.params.provider.CsvSource;
3637
import org.mockito.junit.jupiter.MockitoExtension;
3738

3839
@ExtendWith(MockitoExtension.class)
@@ -76,129 +77,67 @@ public void testJSONFile() throws IOException, URISyntaxException {
7677
assertEquals(AssertCounterAction.Operator.EQUAL, objAsAction.getOperator());
7778
}
7879

79-
@Test
80-
public void ensureThatLessWorks() {
81-
CounterStoreConnector counters = mock(CounterStoreConnector.class);
82-
83-
ConnectorManager connector = mock(ConnectorManager.class);
84-
given(connector.getConnector(CounterStoreConnector.class)).willReturn(counters);
85-
86-
assertAction.setOperator(AssertCounterAction.Operator.LESS_THAN);
87-
88-
// <
89-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE - 1);
90-
ExecuteResult result = assertAction.execute(connector);
91-
assertTrue(result.isSuccess());
92-
93-
// ==
94-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE);
95-
result = assertAction.execute(connector);
96-
assertFalse(result.isSuccess());
97-
98-
// >
99-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE + 1);
100-
result = assertAction.execute(connector);
101-
assertFalse(result.isSuccess());
80+
@ParameterizedTest(name = "use counter value: \"{0}\", success: \"{1}\" for the test")
81+
@CsvSource({
82+
"41, true",
83+
"42, false",
84+
"43, false",
85+
})
86+
public void ensureThatLessWorks(int value, boolean success) {
87+
ensureThatOperatorWorks(AssertCounterAction.Operator.LESS_THAN, value, success);
10288
}
10389

104-
@Test
105-
public void ensureThatLessOrEqualsWorks() {
106-
CounterStoreConnector counters = mock(CounterStoreConnector.class);
107-
108-
ConnectorManager connector = mock(ConnectorManager.class);
109-
given(connector.getConnector(CounterStoreConnector.class)).willReturn(counters);
110-
111-
assertAction.setOperator(AssertCounterAction.Operator.LESS_OR_EQUAL);
112-
113-
// <
114-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE - 1);
115-
ExecuteResult result = assertAction.execute(connector);
116-
assertTrue(result.isSuccess());
117-
118-
// ==
119-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE);
120-
result = assertAction.execute(connector);
121-
assertTrue(result.isSuccess());
122-
123-
// >
124-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE + 1);
125-
result = assertAction.execute(connector);
126-
assertFalse(result.isSuccess());
90+
@ParameterizedTest(name = "use counter value: \"{0}\", success: \"{1}\" for the test")
91+
@CsvSource({
92+
"41, true",
93+
"42, true",
94+
"43, false",
95+
})
96+
public void ensureThatLessOrEqualsWorks(int value, boolean success) {
97+
ensureThatOperatorWorks(AssertCounterAction.Operator.LESS_OR_EQUAL, value, success);
12798
}
12899

129-
@Test
130-
public void ensureThatEqualsWorks() {
131-
CounterStoreConnector counters = mock(CounterStoreConnector.class);
132-
133-
ConnectorManager connector = mock(ConnectorManager.class);
134-
given(connector.getConnector(CounterStoreConnector.class)).willReturn(counters);
135-
136-
assertAction.setOperator(AssertCounterAction.Operator.EQUAL);
137-
138-
// <
139-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE - 1);
140-
ExecuteResult result = assertAction.execute(connector);
141-
assertFalse(result.isSuccess());
142-
143-
// ==
144-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE);
145-
result = assertAction.execute(connector);
146-
assertTrue(result.isSuccess());
147-
148-
// >
149-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE + 1);
150-
result = assertAction.execute(connector);
151-
assertFalse(result.isSuccess());
100+
@ParameterizedTest(name = "use counter value: \"{0}\", success: \"{1}\" for the test")
101+
@CsvSource({
102+
"41, false",
103+
"42, true",
104+
"43, false",
105+
})
106+
public void ensureThatEqualsWorks(int value, boolean success) {
107+
ensureThatOperatorWorks(AssertCounterAction.Operator.EQUAL, value, success);
152108
}
153109

154-
@Test
155-
public void ensureThatGreaterOrEqualsWorks() {
156-
CounterStoreConnector counters = mock(CounterStoreConnector.class);
157-
158-
ConnectorManager connector = mock(ConnectorManager.class);
159-
given(connector.getConnector(CounterStoreConnector.class)).willReturn(counters);
160-
161-
assertAction.setOperator(AssertCounterAction.Operator.GREATER_OR_EQUAL);
162-
163-
// <
164-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE - 1);
165-
ExecuteResult result = assertAction.execute(connector);
166-
assertFalse(result.isSuccess());
167-
168-
// ==
169-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE);
170-
result = assertAction.execute(connector);
171-
assertTrue(result.isSuccess());
110+
@ParameterizedTest(name = "use counter value: \"{0}\", success: \"{1}\" for the test")
111+
@CsvSource({
112+
"41, false",
113+
"42, true",
114+
"43, true",
115+
})
116+
public void ensureThatGreaterOrEqualsWorks(int value, boolean success) {
117+
ensureThatOperatorWorks(AssertCounterAction.Operator.GREATER_OR_EQUAL, value, success);
118+
}
172119

173-
// >
174-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE + 1);
175-
result = assertAction.execute(connector);
176-
assertTrue(result.isSuccess());
120+
@ParameterizedTest(name = "use counter value: \"{0}\", success: \"{1}\" for the test")
121+
@CsvSource({
122+
"41, false",
123+
"42, false",
124+
"43, true",
125+
})
126+
public void ensureThatGreaterWorks(int value, boolean success) {
127+
ensureThatOperatorWorks(AssertCounterAction.Operator.GREATER_THAN, value, success);
177128
}
178129

179-
@Test
180-
public void ensureThatGreaterWorks() {
130+
private void ensureThatOperatorWorks(AssertCounterAction.Operator operator, int value, boolean success) {
181131
CounterStoreConnector counters = mock(CounterStoreConnector.class);
182132

183133
ConnectorManager connector = mock(ConnectorManager.class);
184134
given(connector.getConnector(CounterStoreConnector.class)).willReturn(counters);
185135

186-
assertAction.setOperator(AssertCounterAction.Operator.GREATER_THAN);
136+
assertAction.setOperator(operator);
187137

188-
// <
189-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE - 1);
138+
given(counters.get(TEST_NAME)).willReturn(value);
190139
ExecuteResult result = assertAction.execute(connector);
191-
assertFalse(result.isSuccess());
192-
193-
// ==
194-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE);
195-
result = assertAction.execute(connector);
196-
assertFalse(result.isSuccess());
197-
198-
// >
199-
given(counters.get(TEST_NAME)).willReturn(TEST_VALUE + 1);
200-
result = assertAction.execute(connector);
201-
assertTrue(result.isSuccess());
140+
assertEquals(success, result.isSuccess());
202141
}
203142

204143
}

‎backend/src/test/java/de/learnlib/alex/integrationtests/repositories/AbstractRepositoryIT.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,17 @@
2828
import de.learnlib.alex.integrationtests.TestPostgresqlContainer;
2929
import de.learnlib.alex.settings.dao.SettingsDAO;
3030
import org.junit.jupiter.api.AfterEach;
31+
import org.junit.jupiter.api.extension.ExtendWith;
3132
import org.springframework.beans.factory.annotation.Autowired;
3233
import org.springframework.boot.test.context.SpringBootTest;
34+
import org.springframework.test.context.junit.jupiter.SpringExtension;
3335
import org.springframework.transaction.annotation.Transactional;
3436
import org.testcontainers.containers.PostgreSQLContainer;
3537
import org.testcontainers.junit.jupiter.Container;
3638
import org.testcontainers.junit.jupiter.Testcontainers;
3739

3840
@Testcontainers
39-
//@ExtendWith(SpringExtension.class)
41+
@ExtendWith(SpringExtension.class)
4042
@SpringBootTest(
4143
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
4244
)

‎backend/src/test/java/de/learnlib/alex/integrationtests/repositories/CounterRepositoryIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
import de.learnlib.alex.data.entities.Project;
2727
import de.learnlib.alex.data.repositories.CounterRepository;
2828
import java.util.List;
29-
import javax.inject.Inject;
3029
import org.junit.jupiter.api.BeforeEach;
3130
import org.junit.jupiter.api.Test;
31+
import org.springframework.beans.factory.annotation.Autowired;
3232
import org.springframework.dao.DataIntegrityViolationException;
3333
import org.springframework.dao.EmptyResultDataAccessException;
3434

3535
public class CounterRepositoryIT extends AbstractRepositoryIT {
3636

37-
@Inject
37+
@Autowired
3838
private CounterRepository counterRepository;
3939

4040
private User user;

‎backend/src/test/java/de/learnlib/alex/integrationtests/repositories/LearnerResultStepRepositoryIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
import de.learnlib.alex.learning.entities.LearnerResultStep;
2727
import de.learnlib.alex.learning.repositories.LearnerResultRepository;
2828
import de.learnlib.alex.learning.repositories.LearnerResultStepRepository;
29-
import javax.inject.Inject;
3029
import org.junit.jupiter.api.BeforeEach;
3130
import org.junit.jupiter.api.Test;
31+
import org.springframework.beans.factory.annotation.Autowired;
3232
import org.springframework.dao.DataIntegrityViolationException;
3333

3434
public class LearnerResultStepRepositoryIT extends AbstractRepositoryIT {
3535

36-
@Inject
36+
@Autowired
3737
private LearnerResultRepository learnerResultRepository;
3838

39-
@Inject
39+
@Autowired
4040
private LearnerResultStepRepository learnerResultStepRepository;
4141

4242
private Project project;

‎backend/src/test/java/de/learnlib/alex/integrationtests/repositories/ProjectRepositoryIT.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
import de.learnlib.alex.data.entities.Project;
2626
import de.learnlib.alex.data.repositories.SymbolGroupRepository;
2727
import java.util.List;
28-
import javax.inject.Inject;
2928
import javax.validation.ValidationException;
3029
import org.junit.jupiter.api.BeforeEach;
3130
import org.junit.jupiter.api.Test;
31+
import org.springframework.beans.factory.annotation.Autowired;
3232
import org.springframework.dao.EmptyResultDataAccessException;
3333

3434
public class ProjectRepositoryIT extends AbstractRepositoryIT {
3535

36-
@Inject
36+
@Autowired
3737
private SymbolGroupRepository symbolGroupRepository;
3838

3939
private User user;
@@ -121,13 +121,6 @@ public void shouldReturnNullWhenFetchingANonExistingProjectOfAUserByItsID() {
121121
assertNull(projectFromDB);
122122
}
123123

124-
@Test
125-
public void shouldReturnNullWhenFetchingANonExistingProjectsOfAUserByItsName() {
126-
Project projectFromDB = projectRepository.findById(-1L).orElse(null);
127-
128-
assertNull(projectFromDB);
129-
}
130-
131124
@Test
132125
public void shouldDeleteAProject() {
133126
Project project = createProject(user, "Test Project");

‎backend/src/test/java/de/learnlib/alex/integrationtests/repositories/SymbolGroupRepositoryIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
import de.learnlib.alex.data.entities.SymbolGroup;
2727
import de.learnlib.alex.data.repositories.SymbolGroupRepository;
2828
import java.util.List;
29-
import javax.inject.Inject;
3029
import javax.validation.ValidationException;
3130
import org.junit.jupiter.api.BeforeEach;
3231
import org.junit.jupiter.api.Test;
32+
import org.springframework.beans.factory.annotation.Autowired;
3333
import org.springframework.dao.DataIntegrityViolationException;
3434
import org.springframework.dao.EmptyResultDataAccessException;
3535

3636
public class SymbolGroupRepositoryIT extends AbstractRepositoryIT {
3737

38-
@Inject
38+
@Autowired
3939
private SymbolGroupRepository symbolGroupRepository;
4040

4141
private User user;

0 commit comments

Comments
 (0)