rebased on master and solved merge conflicts

stijnpotters1 · stijnpotters1 · commit 93a16802a791 · 2026-06-29T16:27:23.000+02:00
diff --git a/src/test/java/org/frankframework/flow/configuration/ConfigurationServiceTest.java b/src/test/java/org/frankframework/flow/configuration/ConfigurationServiceTest.java
@@ -346,9 +346,7 @@ void addConfiguration_Success() throws Exception {
 		AdapterLocationDTO result = configurationService.addConfiguration("myproject", target.toString());
 
 		assertNotNull(result);
-
-		Path expectedFile = projectDir.resolve("NewConfig.xml");
-		assertTrue(Files.exists(expectedFile), "NewConfig.xml should be created on disk");
+		assertTrue(Files.exists(target), "NewConfig.xml should be created inside src/main/configurations");
 		verify(fileTreeService).invalidateTreeCache("myproject");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -346,9 +346,7 @@ void addConfiguration_Success() throws Exception {`
`346`	`346`	`AdapterLocationDTO result = configurationService.addConfiguration("myproject", target.toString());`
`347`	`347`
`348`	`348`	`assertNotNull(result);`
`349`		`-`
`350`		`- Path expectedFile = projectDir.resolve("NewConfig.xml");`
`351`		`- assertTrue(Files.exists(expectedFile), "NewConfig.xml should be created on disk");`
	`349`	`+ assertTrue(Files.exists(target), "NewConfig.xml should be created inside src/main/configurations");`
`352`	`350`	`verify(fileTreeService).invalidateTreeCache("myproject");`
`353`	`351`	`}`
`354`	`352`