Skip to content

Commit 8f07fea

Browse files
fabapp2fabapp2
authored
Unify method names in TestProjectContext.Builder (#814)
1 parent d5f5748 commit 8f07fea

File tree

71 files changed

+252
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+252
-282
lines changed

‎components/sbm-core/src/test/java/org/springframework/sbm/build/api/ModuleTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ void testGetModule() {
106106
String javaSource4 = "public class SomeTest {}";
107107

108108
ProjectContext context = TestProjectContext.buildProjectContext()
109-
.addProjectResource("pom.xml", parentPom)
110-
.addProjectResource("module1/pom.xml", pom1)
111-
.addProjectResource("module2/pom.xml", pom2)
112-
.addJavaSource("module1/src/main/java", javaSource2)
113-
.addJavaSource("module2/src/main/java", javaSource3)
114-
.addJavaSource("module2/src/test/java", javaSource4)
109+
.withProjectResource("pom.xml", parentPom)
110+
.withProjectResource("module1/pom.xml", pom1)
111+
.withProjectResource("module2/pom.xml", pom2)
112+
.withJavaSource("module1/src/main/java", javaSource2)
113+
.withJavaSource("module2/src/main/java", javaSource3)
114+
.withJavaSource("module2/src/test/java", javaSource4)
115115
.build();
116116

117117
Module parentModule = context.getApplicationModules().getModule(Path.of(""));

‎components/sbm-core/src/test/java/org/springframework/sbm/build/api/Module_contains_Test.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public class SomeClassTest {}
4646
ProjectContext context = TestProjectContext
4747
.buildProjectContext()
4848
.withMavenBuildFileSource("pom.xml", rootPom)
49-
.addJavaSource("src/main/java", javaClass)
50-
.addProjectResource("src/main/resources/resource-found.txt", "")
51-
.addJavaSource("src/test/java", testjavaClass)
52-
.addProjectResource("src/test/resources/test-resource-found.txt", "")
53-
.addProjectResource("not-in-source-set.txt", "")
49+
.withJavaSource("src/main/java", javaClass)
50+
.withProjectResource("src/main/resources/resource-found.txt", "")
51+
.withJavaSource("src/test/java", testjavaClass)
52+
.withProjectResource("src/test/resources/test-resource-found.txt", "")
53+
.withProjectResource("not-in-source-set.txt", "")
5454
.build();
5555

5656
Module root = context.getApplicationModules().getModule("root");
@@ -97,18 +97,18 @@ public class SomeClassTest {}
9797
.buildProjectContext()
9898
// parent module
9999
.withMavenBuildFileSource("pom.xml", rootPom)
100-
.addProjectResource("not-in-source-set.txt", "")
100+
.withProjectResource("not-in-source-set.txt", "")
101101
// module1
102102
.withMavenBuildFileSource("module1/pom.xml", module1Pom)
103-
.addJavaSource("module1/src/test/java", testjavaClass)
104-
.addProjectResource("module1/src/test/resources/test-resource-found.txt", "")
103+
.withJavaSource("module1/src/test/java", testjavaClass)
104+
.withProjectResource("module1/src/test/resources/test-resource-found.txt", "")
105105
// module-in-module1
106106
.withMavenBuildFileSource("module1/module-in-module1/pom.xml", moduleInModule1Pom)
107-
.addProjectResource(sourcePathString, "")
107+
.withProjectResource(sourcePathString, "")
108108
// module2
109109
.withMavenBuildFileSource("module2/pom.xml", module2Pom)
110-
.addJavaSource("module2/src/main/java", javaClass)
111-
.addProjectResource("module2/src/main/resources/resource-found.txt", "")
110+
.withJavaSource("module2/src/main/java", javaClass)
111+
.withProjectResource("module2/src/main/resources/resource-found.txt", "")
112112

113113
.build();
114114

‎components/sbm-core/src/test/java/org/springframework/sbm/build/api/Module_searchMainJava_Test.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void withClassesInSrcMainJavaProvidesProjectResourcesWithMainClasses() {
7979
ProjectContext context = TestProjectContext
8080
.buildProjectContext()
8181
.withMavenBuildFileSource("pom.xml", singlePom)
82-
.addJavaSource("src/main/java", "public class SomeClass{}")
82+
.withJavaSource("src/main/java", "public class SomeClass{}")
8383
.build();
8484

8585
verifySearchMain(context, projectResourceSet -> {
@@ -93,8 +93,8 @@ void withClassesInSrcMainJavaProvidesProjectResourcesWithMainClasses() {
9393
@DisplayName("with classes in src/main/java and src/test/java provides ProjectResourceSet with classes from src/main/java")
9494
void withClassesInTestAndMain_providesClassesFromMain() {
9595
ProjectContext context = builder
96-
.addJavaSource("src/main/java", "public class SomeClass{}")
97-
.addJavaSource("src/test/java", "public class SomeClassTest{}")
96+
.withJavaSource("src/main/java", "public class SomeClass{}")
97+
.withJavaSource("src/test/java", "public class SomeClassTest{}")
9898
.build();
9999

100100
verifySearchMain(context, projectResourceSet -> {
@@ -109,7 +109,7 @@ void withClassesInTestAndMain_providesClassesFromMain() {
109109
void withClassesInSrcTestJava_providesEmptyProjectResources() {
110110

111111
ProjectContext context = builder
112-
.addProjectResource("src/test/java/SomeClass.java", "public class SomeClass{}")
112+
.withProjectResource("src/test/java/SomeClass.java", "public class SomeClass{}")
113113
.build();
114114

115115
verifySearchMain(context, projectResourceSet -> assertThat(projectResourceSet.list()).isEmpty(), "");
@@ -202,7 +202,7 @@ void withNoClasses_providesEmptyProjectResources() {
202202
void withClassesInOtherModules_providesEmptyProjectResources() {
203203

204204
ProjectContext context = builder
205-
.addJavaSource("component/src/main/java", "public class SomeClass{}")
205+
.withJavaSource("component/src/main/java", "public class SomeClass{}")
206206
.build();
207207

208208
verifySearchMain(context, (projectResourceSet) -> assertThat(projectResourceSet.list()).isEmpty(),
@@ -214,8 +214,8 @@ void withClassesInOtherModules_providesEmptyProjectResources() {
214214
void withClassesInMainAndTest_providesClassesFromSrcMainJava() {
215215

216216
ProjectContext context = builder
217-
.addJavaSource("application/src/main/java", "public class SomeClass{}")
218-
.addJavaSource("application/src/test/java", "public class SomeClassTest{}")
217+
.withJavaSource("application/src/main/java", "public class SomeClass{}")
218+
.withJavaSource("application/src/test/java", "public class SomeClassTest{}")
219219
.build();
220220

221221
verifySearchMain(context,
@@ -232,7 +232,7 @@ void withClassesInMainAndTest_providesClassesFromSrcMainJava() {
232232
void withClassesInMain_providesClassesFromSrcMainJava() {
233233

234234
ProjectContext context = builder
235-
.addJavaSource("application/src/main/java", "public class SomeClass{}")
235+
.withJavaSource("application/src/main/java", "public class SomeClass{}")
236236
.build();
237237

238238
verifySearchMain(context,

‎components/sbm-core/src/test/java/org/springframework/sbm/build/api/Module_searchMainResources_Test.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void withResourcesInSrcMainResourcesProvidesProjectResourcesWithMainResources()
8585
ProjectContext context = TestProjectContext
8686
.buildProjectContext()
8787
.withMavenBuildFileSource("pom.xml", singlePom)
88-
.addProjectResource("src/main/resources/some-resource.txt", "the content")
88+
.withProjectResource("src/main/resources/some-resource.txt", "the content")
8989
.build();
9090

9191
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -105,8 +105,8 @@ void withResourcesInSrcMainResourcesProvidesProjectResourcesWithMainResources()
105105
@DisplayName("with resources in src/test/resources and src/main/resources provides ProjectResourceSet with resources from src/main/resources")
106106
void withResourcesInTestAndMain_providesResourcesFromMain() {
107107
ProjectContext context = builder
108-
.addProjectResource("src/main/resources/some-resource.txt", "the content")
109-
.addProjectResource("src/test/resources/some-resource.txt", "the test content")
108+
.withProjectResource("src/main/resources/some-resource.txt", "the content")
109+
.withProjectResource("src/test/resources/some-resource.txt", "the test content")
110110
.build();
111111

112112
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -127,7 +127,7 @@ void withResourcesInTestAndMain_providesResourcesFromMain() {
127127
void withResourcesInSrcTestResources_providesEmptyProjectResources() {
128128

129129
ProjectContext context = builder
130-
.addProjectResource("src/test/resources/some-resource.txt", "the content")
130+
.withProjectResource("src/test/resources/some-resource.txt", "the content")
131131
.build();
132132

133133
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -240,7 +240,7 @@ void withNoResources_providesEmptyProjectResources() {
240240
void withResourcesInOtherModules_providesEmptyProjectResources() {
241241

242242
ProjectContext context = builder
243-
.addProjectResource("component/src/main/resources/some-resource.txt", "")
243+
.withProjectResource("component/src/main/resources/some-resource.txt", "")
244244
.build();
245245

246246
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -260,8 +260,8 @@ void withResourcesInOtherModules_providesEmptyProjectResources() {
260260
void withResourcesInMainAndTest_providesProjectResourcesFromSrcMainResources() {
261261

262262
ProjectContext context = builder
263-
.addProjectResource("application/src/main/resources/some-resource.txt", "the content")
264-
.addProjectResource("application/src/test/resources/some-resource.txt", "the test content")
263+
.withProjectResource("application/src/main/resources/some-resource.txt", "the content")
264+
.withProjectResource("application/src/test/resources/some-resource.txt", "the test content")
265265
.build();
266266

267267
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -282,7 +282,7 @@ void withResourcesInMainAndTest_providesProjectResourcesFromSrcMainResources() {
282282
void withResourcesInMain_providesProjectResourcesFromSrcMainResources() {
283283

284284
ProjectContext context = builder
285-
.addProjectResource("application/src/main/resources/some-resource.txt", "the content")
285+
.withProjectResource("application/src/main/resources/some-resource.txt", "the content")
286286
.build();
287287

288288
AtomicBoolean wasCalled = new AtomicBoolean(false);

‎components/sbm-core/src/test/java/org/springframework/sbm/build/api/Module_searchTestJava_Test.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void withClassesInSrcTestJavaProvidesProjectResourcesWithTestClasses() {
7979
ProjectContext context = TestProjectContext
8080
.buildProjectContext()
8181
.withMavenBuildFileSource("pom.xml", singlePom)
82-
.addJavaSource("src/test/java", "public class SomeClass{}")
82+
.withJavaSource("src/test/java", "public class SomeClass{}")
8383
.build();
8484

8585
verifySearchTest(context, projectResourceSet -> {
@@ -93,8 +93,8 @@ void withClassesInSrcTestJavaProvidesProjectResourcesWithTestClasses() {
9393
@DisplayName("with classes in src/main/java and src/test/java provides ProjectResourceSet with classes from src/test/java")
9494
void withClassesInTestAndMain_providesClassesFromTest() {
9595
ProjectContext context = builder
96-
.addJavaSource("src/main/java", "public class SomeClass{}")
97-
.addJavaSource("src/test/java", "public class SomeClassTest{}")
96+
.withJavaSource("src/main/java", "public class SomeClass{}")
97+
.withJavaSource("src/test/java", "public class SomeClassTest{}")
9898
.build();
9999

100100
verifySearchTest(context, projectResourceSet -> {
@@ -109,7 +109,7 @@ void withClassesInTestAndMain_providesClassesFromTest() {
109109
void withClassesInSrcMainJava_providesEmptyProjectResources() {
110110

111111
ProjectContext context = builder
112-
.addProjectResource("src/main/java/SomeClass.java", "public class SomeClass{}")
112+
.withProjectResource("src/main/java/SomeClass.java", "public class SomeClass{}")
113113
.build();
114114

115115
verifySearchTest(context, projectResourceSet -> assertThat(projectResourceSet.list()).isEmpty(), "");
@@ -202,7 +202,7 @@ void withNoClasses_providesEmptyProjectResources() {
202202
void withClassesInOtherModules_providesEmptyProjectResources() {
203203

204204
ProjectContext context = builder
205-
.addJavaSource("component/src/test/java", "public class SomeClass{}")
205+
.withJavaSource("component/src/test/java", "public class SomeClass{}")
206206
.build();
207207

208208
verifySearchTest(context, (projectResourceSet) -> assertThat(projectResourceSet.list()).isEmpty(),
@@ -214,8 +214,8 @@ void withClassesInOtherModules_providesEmptyProjectResources() {
214214
void withResourcesInMainAndTest_providesProjectResourcesFromSrcMainResources() {
215215

216216
ProjectContext context = builder
217-
.addJavaSource("application/src/main/java", "public class SomeClass{}")
218-
.addJavaSource("application/src/test/java", "public class SomeClassTest{}")
217+
.withJavaSource("application/src/main/java", "public class SomeClass{}")
218+
.withJavaSource("application/src/test/java", "public class SomeClassTest{}")
219219
.build();
220220

221221
verifySearchTest(context,
@@ -232,7 +232,7 @@ void withResourcesInMainAndTest_providesProjectResourcesFromSrcMainResources() {
232232
void withClassesInTest_providesClassesFromSrcTestJava() {
233233

234234
ProjectContext context = builder
235-
.addJavaSource("application/src/test/java", "public class SomeClassTest{}")
235+
.withJavaSource("application/src/test/java", "public class SomeClassTest{}")
236236
.build();
237237

238238
verifySearchTest(context,

‎components/sbm-core/src/test/java/org/springframework/sbm/build/api/Module_searchTestResources_Test.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void withResourcesInSrcTestResourcesProvidesProjectResourcesWithMainResources()
8484
ProjectContext context = TestProjectContext
8585
.buildProjectContext()
8686
.withMavenBuildFileSource("pom.xml", singlePom)
87-
.addProjectResource("src/test/resources/some-resource.txt", "the content")
87+
.withProjectResource("src/test/resources/some-resource.txt", "the content")
8888
.build();
8989

9090
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -104,8 +104,8 @@ void withResourcesInSrcTestResourcesProvidesProjectResourcesWithMainResources()
104104
@DisplayName("with resources in src/main/resources and src/test/resources provides ProjectResourceSet with resources from src/test/resources")
105105
void withResourcesInTestAndMain_providesResourcesFromTest() {
106106
ProjectContext context = builder
107-
.addProjectResource("src/main/resources/some-resource.txt", "the content")
108-
.addProjectResource("src/test/resources/some-resource.txt", "the test content")
107+
.withProjectResource("src/main/resources/some-resource.txt", "the content")
108+
.withProjectResource("src/test/resources/some-resource.txt", "the test content")
109109
.build();
110110

111111
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -126,7 +126,7 @@ void withResourcesInTestAndMain_providesResourcesFromTest() {
126126
void withResourcesInSrcTestResources_providesEmptyProjectResources() {
127127

128128
ProjectContext context = builder
129-
.addProjectResource("src/main/resources/some-resource.txt", "the content")
129+
.withProjectResource("src/main/resources/some-resource.txt", "the content")
130130
.build();
131131

132132
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -239,7 +239,7 @@ void withNoResources_providesEmptyProjectResources() {
239239
void withResourcesInOtherModules_providesEmptyProjectResources() {
240240

241241
ProjectContext context = builder
242-
.addProjectResource("component/src/test/resources/some-resource.txt", "")
242+
.withProjectResource("component/src/test/resources/some-resource.txt", "")
243243
.build();
244244

245245
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -259,8 +259,8 @@ void withResourcesInOtherModules_providesEmptyProjectResources() {
259259
void withResourcesInMainAndTest_providesProjectResourcesFromSrcMainResources() {
260260

261261
ProjectContext context = builder
262-
.addProjectResource("application/src/main/resources/some-resource.txt", "the content")
263-
.addProjectResource("application/src/test/resources/some-resource.txt", "the test content")
262+
.withProjectResource("application/src/main/resources/some-resource.txt", "the content")
263+
.withProjectResource("application/src/test/resources/some-resource.txt", "the test content")
264264
.build();
265265

266266
AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -281,7 +281,7 @@ void withResourcesInMainAndTest_providesProjectResourcesFromSrcMainResources() {
281281
void withResourcesInMain_providesProjectResourcesFromSrcMainResources() {
282282

283283
ProjectContext context = builder
284-
.addProjectResource("application/src/test/resources/some-resource.txt", "the content")
284+
.withProjectResource("application/src/test/resources/some-resource.txt", "the content")
285285
.build();
286286

287287
AtomicBoolean wasCalled = new AtomicBoolean(false);

‎components/sbm-core/src/test/java/org/springframework/sbm/common/migration/actions/MoveFilesActionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ void moveFile() {
5050

5151
ProjectContext projectContext = TestProjectContext.buildProjectContext()
5252
.withProjectRoot(projectRoot)
53-
.addProjectResource(someFilePath, fileContent1)
54-
.addProjectResource(anotherFilePath, fileContent2)
53+
.withProjectResource(someFilePath, fileContent1)
54+
.withProjectResource(anotherFilePath, fileContent2)
5555
.build();
5656

5757
ProjectResource someFile = projectContext.search(new PathPatternMatchingProjectResourceFinder("/**/SomeFile.foo")).get(0);

‎components/sbm-core/src/test/java/org/springframework/sbm/common/migration/conditions/FileExistTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class FileExistTest {
2525
@Test
2626
void shouldReturnTrueWhenFileExist() {
2727
ProjectContext context = TestProjectContext.buildProjectContext()
28-
.addEmptyProjectResource("src/main/resources/some.file")
28+
.withEmptyProjectResource("src/main/resources/some.file")
2929
.build();
3030

3131
FileExist sut = FileExist.builder().fileName("some.file").build();

‎components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteDeclarativeRecipeAdapterIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void adapterActionShouldExecuteOpenRewriteYamlRecipe() throws IOException {
8787
String javaSource = "@java.lang.Deprecated\n" +
8888
"public class Foo {}";
8989
ProjectContext context = TestProjectContext.buildProjectContext()
90-
.addJavaSource("src/main/java", javaSource)
90+
.withJavaSource("src/main/java", javaSource)
9191
.build();
9292
// run the adapter action and thus the declared rewrite recipes
9393
recipeAdapter.apply(context);

‎components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteNamedRecipeAdapterIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void recipeFromYaml() throws IOException {
7979
"}\n";
8080

8181
ProjectContext context = TestProjectContext.buildProjectContext()
82-
.addJavaSource("src/main/java", javaSource)
82+
.withJavaSource("src/main/java", javaSource)
8383
.build();
8484
// and apply the adapter
8585
recipeAdapter.apply(context);
@@ -111,7 +111,7 @@ public void propagateExceptionFromOpenRewriteRecipe() throws IOException {
111111
"public class Foo {}";
112112

113113
ProjectContext context = TestProjectContext.buildProjectContext()
114-
.addJavaSource("src/main/java", javaSource)
114+
.withJavaSource("src/main/java", javaSource)
115115
.build();
116116

117117
RuntimeException thrown = assertThrows(RuntimeException.class, () -> recipeAdapter.apply(context));

0 commit comments

Comments
 (0)