Skip to content

Commit 52fb057

Browse files
committed
Solve Junit5 sonar issues
Signed-off-by: freddidierRTE <[email protected]>
1 parent 710102f commit 52fb057

File tree

20 files changed

+593
-600
lines changed

20 files changed

+593
-600
lines changed

backend/cards-consultation/src/test/java/org/opfab/cards/consultation/controllers/CardOperationsControllerShould.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ public CardOperationsControllerShould() {
108108
}
109109

110110
@AfterEach
111-
public void clean() {
111+
void clean() {
112112
repository.deleteAll().subscribe();
113113
}
114114

115115
@BeforeEach
116-
public void initCardData() {
116+
void initCardData() {
117117
service.clearSubscriptions();
118118
StepVerifier.create(repository.deleteAll()).expectComplete().verify();
119119
int processNo = 0;

backend/cards-consultation/src/test/java/org/opfab/cards/consultation/repositories/ArchivedCardRepositoryShould.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import java.util.List;
3434
import java.util.function.Predicate;
3535

36-
import javax.smartcardio.Card;
37-
3836
import static org.assertj.core.api.Assertions.assertThat;
3937
import static org.junit.jupiter.api.Assertions.assertTrue;
4038
import static org.opfab.cards.consultation.TestUtilities.*;
@@ -80,12 +78,12 @@ public class ArchivedCardRepositoryShould {
8078
private ArchivedCardRepository repository;
8179

8280
@AfterEach
83-
public void clean() {
81+
void clean() {
8482
repository.deleteAll().subscribe();
8583
}
8684

8785
@BeforeAll
88-
public static void initUsers() {
86+
static void initUsers() {
8987
ComputedPerimeter perimeter = new ComputedPerimeter();
9088
perimeter.setProcess("PROCESS");
9189
perimeter.setState("anyState");
@@ -130,7 +128,7 @@ private CardsFilter getCardsFilter(List<FilterModel> filters) {
130128
}
131129

132130
@BeforeEach
133-
public void initCardData() {
131+
void initCardData() {
134132

135133
int processNo = 0;
136134
// create past cards

backend/cards-consultation/src/test/java/org/opfab/cards/consultation/routes/ArchivedCardRoutesShould.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ArchivedCardRoutesShould {
5151
private ArchivedCardRepository repository;
5252

5353
@AfterEach
54-
public void cleanArchivedCardRepository() {
54+
void cleanArchivedCardRepository() {
5555
repository.deleteAll().subscribe();
5656

5757
}

backend/cards-consultation/src/test/java/org/opfab/cards/consultation/routes/CardRoutesShould.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class CardRoutesShould {
5555
private CardRepository repository;
5656

5757
@AfterEach
58-
public void cleanCardRepository() {
58+
void cleanCardRepository() {
5959
repository.deleteAll().subscribe();
6060
}
6161

backend/cards-consultation/src/test/java/org/opfab/cards/consultation/routes/ConnectionRoutesShould.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public ConnectionRoutesShould() {
5757
}
5858

5959
@BeforeEach
60-
public void clearSubscriptions() {
60+
void clearSubscriptions() {
6161
service.clearSubscriptions();
6262
}
6363

backend/cards-publication/src/test/java/org/opfab/cards/publication/kafka/command/CreateCardCommandHandlerShould.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CreateCardCommandHandlerShould {
4242
private CreateCardCommandHandler cut;
4343

4444
@BeforeAll
45-
public void setUp() {
45+
void setUp() {
4646
services = mock(Services.class);
4747
cardProcessingService = mock(CardProcessingService.class);
4848
objectMapper = mock(CardObjectMapper.class);

backend/cards-publication/src/test/java/org/opfab/cards/publication/kafka/command/DeleteCardCommandHandlerShould.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class DeleteCardCommandHandlerShould {
4545
private DeleteCardCommandHandler cut;
4646

4747
@BeforeAll
48-
public void setUp() {
48+
void setUp() {
4949
services = mock(Services.class);
5050
cardDeletionService = mock(CardDeletionService.class);
5151
objectMapper = mock(CardObjectMapper.class);
@@ -71,7 +71,7 @@ void executeCommand() throws JsonProcessingException {
7171
cut.executeCommand(cardCommandMock);
7272

7373
verify(cardDeletionService, times(1))
74-
.deleteCardById(any(),notNull(),any());
74+
.deleteCardById(any(), notNull(), any());
7575
}
7676

7777
}

backend/cards-publication/src/test/java/org/opfab/cards/publication/kafka/command/UpdateCardCommandHandlerShould.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class UpdateCardCommandHandlerShould {
3939
private UpdateCardCommandHandler cut;
4040

4141
@BeforeAll
42-
public void setUp() {
42+
void setUp() {
4343
services = mock(Services.class);
4444
cardProcessingService = mock(CardProcessingService.class);
4545
objectMapper = mock(CardObjectMapper.class);
@@ -55,7 +55,8 @@ void getCommandType() {
5555
@Test
5656
void executeCommand() throws JsonProcessingException {
5757
CardCommand cardCommandMock = mock(CardCommand.class);
58-
org.opfab.cards.publication.model.Card cardPublicationDataMock = mock (org.opfab.cards.publication.model.Card.class);
58+
org.opfab.cards.publication.model.Card cardPublicationDataMock = mock(
59+
org.opfab.cards.publication.model.Card.class);
5960
Card cardMock = mock(Card.class);
6061
when(cardCommandMock.getCard()).thenReturn(cardMock);
6162
when(objectMapper.writeValueAsString(any())).thenReturn("");

backend/cards-publication/src/test/java/org/opfab/cards/publication/ratelimiter/CardSendingLimiterShould.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ class CardSendingLimiterShould {
2424
private final int limitPeriodInSec = 60;
2525

2626
@BeforeEach
27-
public void init() {
27+
void init() {
2828
testClock = new TestClock(Clock.fixed(Instant.parse("2001-06-09T00:00:00.00Z"), ZoneId.systemDefault()));
2929
limiter = new CardSendingLimiter(limitCardCount, limitPeriodInSec, testClock);
3030
}
3131

3232
@Test
3333
void isPermissionRefusedWhenLimitReached() {
34-
for (int i=0; i<limitCardCount; i++) {
34+
for (int i = 0; i < limitCardCount; i++) {
3535
limiter.isNewSendingAllowed("publisher1");
3636
}
3737

3838
Assertions.assertFalse(limiter.isNewSendingAllowed("PUBLISHER1"));
3939
}
40-
40+
4141
@Test
4242
void isLimiterReset() {
43-
for (int i=0; i<limitCardCount; i++) {
43+
for (int i = 0; i < limitCardCount; i++) {
4444
limiter.isNewSendingAllowed("publisher1");
4545
}
4646
Assertions.assertFalse(limiter.isNewSendingAllowed("PUBLISHER1"));
@@ -50,7 +50,7 @@ void isLimiterReset() {
5050

5151
@Test
5252
void isPermissionAcceptedWhenWaitAfterLimitReached() {
53-
for (int i=0; i<limitCardCount; i++) {
53+
for (int i = 0; i < limitCardCount; i++) {
5454
limiter.isNewSendingAllowed("publisher1");
5555
}
5656

@@ -60,13 +60,13 @@ void isPermissionAcceptedWhenWaitAfterLimitReached() {
6060

6161
@Test
6262
void multiplePublishers() {
63-
for (int i=0; i<limitCardCount; i++) {
63+
for (int i = 0; i < limitCardCount; i++) {
6464
limiter.isNewSendingAllowed("publisher1");
6565
}
6666
testClock.offset(Duration.ofSeconds(30));
6767
Assertions.assertFalse(limiter.isNewSendingAllowed("PUBLISHER1"));
6868

69-
for (int i=0; i<limitCardCount; i++) {
69+
for (int i = 0; i < limitCardCount; i++) {
7070
limiter.isNewSendingAllowed("publisher2");
7171
}
7272
testClock.offset(Duration.ofSeconds(31));

backend/cards-publication/src/test/java/org/opfab/cards/publication/services/CardDeletionServiceShould.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class CardDeletionServiceShould {
8383
private Optional<Jwt> token = Optional.empty();
8484

8585
@BeforeEach
86-
public void init() {
86+
void init() {
8787
eventBusSpy = new EventBusSpy();
8888
cardNotificationService = new CardNotificationService(eventBusSpy, objectMapper, null);
8989
cardTranslationService = new CardTranslationService(i18NRepositoryMock);

0 commit comments

Comments
 (0)