Skip to content

Commit 1925e04

Browse files
committed
Fix test
1 parent e4c796a commit 1925e04

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import org.openrewrite.maven.cache.MavenArtifactCache;
2828
import org.openrewrite.maven.tree.MavenRepository;
2929
import org.powermock.reflect.Whitebox;
30+
import org.slf4j.Logger;
31+
import org.slf4j.LoggerFactory;
3032
import org.springframework.beans.factory.annotation.Autowired;
3133
import org.springframework.boot.test.context.SpringBootTest;
3234
import org.springframework.context.annotation.Bean;
@@ -202,6 +204,7 @@ void mavenExecutorShouldReadSettings() throws InterruptedException {
202204

203205
Path baseDir = Path.of(TESTCODE_DIR + "/dependent-project");
204206
CountDownLatch latch = new CountDownLatch(1);
207+
Logger log = LoggerFactory.getLogger(PrivateArtifactRepositoryTest.class);
205208
new MavenExecutor(log, successEvent -> {
206209
latch.countDown();
207210
})

spring-rewrite-commons-maven-embedder/src/test/java/org/springframework/rewrite/embedder/MavenExecutorTests.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ class MavenExecutorTests {
5757
@Test
5858
@DisplayName("simple project")
5959
void simpleProject() throws InterruptedException {
60-
Path baseDir = TestProjectHelper.getMavenProject("simple-maven-project");
60+
Path baseDir = TestProjectHelper.getMavenProject("simple");
6161
CountDownLatch latch = new CountDownLatch(1);
6262
new MavenExecutor(logger, successEvent -> {
6363
latch.countDown();
6464
}).execute(List.of("clean", "package"), baseDir);
65-
latch.await(10, TimeUnit.SECONDS);
65+
latch.await(30, TimeUnit.SECONDS);
6666
assertThat(latch.getCount()).isEqualTo(0);
6767
}
6868

@@ -201,8 +201,10 @@ public void consumeLine(String s) throws IOException {
201201
System.out.println(s);
202202
}
203203
});
204-
request.setPomFile(new File(
205-
"/Users/fkrueger/projects/forks/spring-rewrite-commons-fork/spring-rewrite-commons-launcher/testcode/maven-projects/resources/pom.xml"));
204+
205+
Path pomFile = TestProjectHelper.getMavenProject("simple-spring-boot").resolve("pom.xml");
206+
request.setPomFile(pomFile.toFile());
207+
206208
// org.openrewrite.maven:rewrite-maven-plugin:5.20.0:run
207209
// -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-migrate-java:LATEST,org.openrewrite.recipe:rewrite-hibernate:LATEST,org.openrewrite.recipe:rewrite-java-dependencies:LATEST,org.openrewrite.recipe:rewrite-testing-frameworks:LATEST,org.openrewrite.recipe:rewrite-static-analysis:LATEST,org.openrewrite.recipe:rewrite-spring:LATEST
208210
// -Drewrite.activeRecipes=org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_7

0 commit comments

Comments
 (0)