Skip to content

Commit 42f8ab6

Browse files
author
Vladimir Kotal
committed
use assertAll()
1 parent 9f6d1a4 commit 42f8ab6

File tree

1 file changed

+33
-24
lines changed
  • opengrok-indexer/src/test/java/org/opengrok/indexer/configuration

1 file changed

+33
-24
lines changed

opengrok-indexer/src/test/java/org/opengrok/indexer/configuration/ProjectTest.java

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.List;
3333
import org.junit.jupiter.api.Test;
3434

35+
import static org.junit.jupiter.api.Assertions.assertAll;
3536
import static org.junit.jupiter.api.Assertions.assertEquals;
3637
import static org.junit.jupiter.api.Assertions.assertFalse;
3738
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -96,12 +97,14 @@ public void testGetProject() {
9697
env.setProjects(projects);
9798

9899
// The matching of project name to project should be exact.
99-
assertEquals(foo, Project.getProject("/foo"));
100-
assertEquals(bar, Project.getProject("/foo-bar"));
101-
assertEquals(foo, Project.getProject("/foo/blah.c"));
102-
assertEquals(bar, Project.getProject("/foo-bar/ha.c"));
103-
assertNull(Project.getProject("/foof"));
104-
assertNull(Project.getProject("/foof/ha.c"));
100+
assertAll(
101+
() -> assertEquals(foo, Project.getProject("/foo")),
102+
() -> assertEquals(bar, Project.getProject("/foo-bar")),
103+
() -> assertEquals(foo, Project.getProject("/foo/blah.c")),
104+
() -> assertEquals(bar, Project.getProject("/foo-bar/ha.c")),
105+
() -> assertNull(Project.getProject("/foof")),
106+
() -> assertNull(Project.getProject("/foof/ha.c"))
107+
);
105108
}
106109

107110
/**
@@ -121,10 +124,12 @@ public void testGetProjectDescriptions() {
121124
env.setProjects(projects);
122125

123126
List<String> descs = env.getProjectNames();
124-
assertTrue(descs.contains("foo"));
125-
assertTrue(descs.contains("bar"));
126-
assertFalse(descs.contains("foobar"));
127-
assertEquals(2, descs.size());
127+
assertAll(
128+
() -> assertTrue(descs.contains("foo")),
129+
() -> assertTrue(descs.contains("bar")),
130+
() -> assertFalse(descs.contains("foobar")),
131+
() -> assertEquals(2, descs.size())
132+
);
128133
}
129134

130135
/**
@@ -145,12 +150,14 @@ public void testMergeProjects1() {
145150

146151
p1.completeWithDefaults();
147152

148-
assertEquals(env.getTabSize(), p1.getTabSize());
149-
assertEquals(env.isNavigateWindowEnabled(), p1.isNavigateWindowEnabled());
150-
assertEquals(env.getBugPage(), p1.getBugPage());
151-
assertEquals(env.getBugPattern(), p1.getBugPattern());
152-
assertEquals(env.getReviewPage(), p1.getReviewPage());
153-
assertEquals(env.getReviewPattern(), p1.getReviewPattern());
153+
assertAll(
154+
() -> assertEquals(env.getTabSize(), p1.getTabSize()),
155+
() -> assertEquals(env.isNavigateWindowEnabled(), p1.isNavigateWindowEnabled()),
156+
() -> assertEquals(env.getBugPage(), p1.getBugPage()),
157+
() -> assertEquals(env.getBugPattern(), p1.getBugPattern()),
158+
() -> assertEquals(env.getReviewPage(), p1.getReviewPage()),
159+
() -> assertEquals(env.getReviewPattern(), p1.getReviewPattern())
160+
);
154161
}
155162

156163
/**
@@ -176,14 +183,16 @@ public void testMergeProjects2() {
176183

177184
p1.completeWithDefaults();
178185

179-
assertNotNull(p1);
180-
assertTrue(p1.isNavigateWindowEnabled(), "Navigate window should be turned on");
181-
assertTrue(p1.isHandleRenamedFiles(), "Renamed file handling should be true");
182-
assertEquals(new Project().getTabSize() + 9737, p1.getTabSize());
183-
assertEquals(p1.getBugPage(), customBugPage);
184-
assertEquals(p1.getBugPattern(), customBugPattern);
185-
assertEquals(p1.getReviewPage(), customReviewPage);
186-
assertEquals(p1.getReviewPattern(), customReviewPattern);
186+
assertAll(
187+
() -> assertNotNull(p1),
188+
() -> assertTrue(p1.isNavigateWindowEnabled(), "Navigate window should be turned on"),
189+
() -> assertTrue(p1.isHandleRenamedFiles(), "Renamed file handling should be true"),
190+
() -> assertEquals(new Project().getTabSize() + 9737, p1.getTabSize()),
191+
() -> assertEquals(p1.getBugPage(), customBugPage),
192+
() -> assertEquals(p1.getBugPattern(), customBugPattern),
193+
() -> assertEquals(p1.getReviewPage(), customReviewPage),
194+
() -> assertEquals(p1.getReviewPattern(), customReviewPattern)
195+
);
187196
}
188197

189198
/**

0 commit comments

Comments
 (0)