Skip to content

Commit

Permalink
Make sure previous executors are closed cleanly
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbevin
gbevin committed Sep 30, 2023
1 parent 77ceceb commit 3eb5795
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 43 deletions.
72 changes: 39 additions & 33 deletions src/test/java/rife/bld/operations/TestCreateRife2Operation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,17 +283,19 @@ void testExecute()
/myapp/src/test/resources""").matcher(FileUtils.generateDirectoryListing(tmp)).matches());

var run_operation = new RunOperation().fromProject(create_operation.project());
var executor = Executors.newSingleThreadScheduledExecutor();
var checked_url = new URL("http://localhost:8080");
var check_result = new StringBuilder();
executor.schedule(() -> {
try {
check_result.append(FileUtils.readString(checked_url));
} catch (FileUtilsErrorException e) {
throw new RuntimeException(e);
}
}, 1, TimeUnit.SECONDS);
executor.schedule(() -> run_operation.process().destroy(), 2, TimeUnit.SECONDS);
StringBuilder check_result;
try (var executor = Executors.newSingleThreadScheduledExecutor()) {
var checked_url = new URL("http://localhost:8080");
check_result = new StringBuilder();
executor.schedule(() -> {
try {
check_result.append(FileUtils.readString(checked_url));
} catch (FileUtilsErrorException e) {
throw new RuntimeException(e);
}
}, 1, TimeUnit.SECONDS);
executor.schedule(() -> run_operation.process().destroy(), 2, TimeUnit.SECONDS);
}
assertThrows(ExitStatusException.class, run_operation::execute);

assertTrue(check_result.toString().contains("<p>Hello World Myapp</p>"));
Expand Down Expand Up @@ -533,17 +535,19 @@ void testExecuteLocalDependencies()
/myapp/src/test/resources""").matcher(FileUtils.generateDirectoryListing(tmp)).matches());

var run_operation = new RunOperation().fromProject(create_operation.project());
var executor = Executors.newSingleThreadScheduledExecutor();
var checked_url = new URL("http://localhost:8080");
var check_result = new StringBuilder();
executor.schedule(() -> {
try {
check_result.append(FileUtils.readString(checked_url));
} catch (FileUtilsErrorException e) {
throw new RuntimeException(e);
}
}, 1, TimeUnit.SECONDS);
executor.schedule(() -> run_operation.process().destroy(), 2, TimeUnit.SECONDS);
StringBuilder check_result;
try (var executor = Executors.newSingleThreadScheduledExecutor()) {
var checked_url = new URL("http://localhost:8080");
check_result = new StringBuilder();
executor.schedule(() -> {
try {
check_result.append(FileUtils.readString(checked_url));
} catch (FileUtilsErrorException e) {
throw new RuntimeException(e);
}
}, 1, TimeUnit.SECONDS);
executor.schedule(() -> run_operation.process().destroy(), 2, TimeUnit.SECONDS);
}
assertThrows(ExitStatusException.class, run_operation::execute);

assertTrue(check_result.toString().contains("<p>Hello World Myapp</p>"), check_result.toString());
Expand Down Expand Up @@ -699,17 +703,19 @@ void testExecuteLocalDependenciesFolders()
/myapp/src/test/resources""").matcher(FileUtils.generateDirectoryListing(tmp)).matches());

var run_operation = new RunOperation().fromProject(create_operation.project());
var executor = Executors.newSingleThreadScheduledExecutor();
var checked_url = new URL("http://localhost:8080");
var check_result = new StringBuilder();
executor.schedule(() -> {
try {
check_result.append(FileUtils.readString(checked_url));
} catch (FileUtilsErrorException e) {
throw new RuntimeException(e);
}
}, 1, TimeUnit.SECONDS);
executor.schedule(() -> run_operation.process().destroy(), 2, TimeUnit.SECONDS);
StringBuilder check_result;
try (var executor = Executors.newSingleThreadScheduledExecutor()) {
var checked_url = new URL("http://localhost:8080");
check_result = new StringBuilder();
executor.schedule(() -> {
try {
check_result.append(FileUtils.readString(checked_url));
} catch (FileUtilsErrorException e) {
throw new RuntimeException(e);
}
}, 1, TimeUnit.SECONDS);
executor.schedule(() -> run_operation.process().destroy(), 2, TimeUnit.SECONDS);
}
assertThrows(ExitStatusException.class, run_operation::execute);

assertTrue(check_result.toString().contains("<p>Hello World Myapp</p>"));
Expand Down
21 changes: 11 additions & 10 deletions src/test/java/rife/bld/operations/TestUberJarOperation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,17 @@ void testFromProjectWeb()
var run_operation = new RunOperation()
.javaOptions(List.of("-jar"))
.mainClass(uberjar_file.getAbsolutePath());
var executor = Executors.newSingleThreadScheduledExecutor();
var checked_url = new URL("http://localhost:8080");
executor.schedule(() -> {
try {
check_result.append(FileUtils.readString(checked_url));
} catch (FileUtilsErrorException e) {
throw new RuntimeException(e);
}
}, 1, TimeUnit.SECONDS);
executor.schedule(() -> run_operation.process().destroy(), 2, TimeUnit.SECONDS);
try (var executor = Executors.newSingleThreadScheduledExecutor()) {
var checked_url = new URL("http://localhost:8080");
executor.schedule(() -> {
try {
check_result.append(FileUtils.readString(checked_url));
} catch (FileUtilsErrorException e) {
throw new RuntimeException(e);
}
}, 1, TimeUnit.SECONDS);
executor.schedule(() -> run_operation.process().destroy(), 2, TimeUnit.SECONDS);
}
assertThrows(ExitStatusException.class, run_operation::execute);

assertTrue(check_result.toString().contains("<p>Hello World App</p>"));
Expand Down

0 comments on commit 3eb5795

Please sign in to comment.