Skip to content

Commit

Permalink
build: add test for finding binary dev directory ref #3428
Browse files Browse the repository at this point in the history
  • Loading branch information
jknack committed May 20, 2024
1 parent 4800a5a commit 04760ce
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 8 deletions.
13 changes: 5 additions & 8 deletions jooby/src/main/java/io/jooby/LoggingService.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.ServiceLoader;
import java.util.*;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

Expand Down Expand Up @@ -105,7 +101,7 @@ static String configure(@NonNull ClassLoader classLoader, @NonNull List<String>
.filter(Files::exists)
.map(Path::toAbsolutePath)
// Skip build directories from maven/gradle
.filter(it -> !isBinary(it, "target") && !isBinary(it, "build"))
.filter(it -> !isBinary(it))
.findFirst();
if (logPath.isPresent()) {
System.setProperty(loggingService.getPropertyName(), logPath.get().toString());
Expand Down Expand Up @@ -136,9 +132,10 @@ static String configure(@NonNull ClassLoader classLoader, @NonNull List<String>
return null;
}

static boolean isBinary(Path path, String segment) {
static boolean isBinary(Path path) {
var bin = Set.of("target", "build", "bin");
return StreamSupport.stream(path.spliterator(), false)
.anyMatch(it -> it.toString().equals(segment));
.anyMatch(it -> bin.contains(it.toString()));
}

private static List<Object> logFiles(
Expand Down
25 changes: 25 additions & 0 deletions jooby/src/test/java/io/jooby/LoggingServiceTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Jooby https://jooby.io
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
* Copyright 2014 Edgar Espina
*/
package io.jooby;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.nio.file.Paths;

import org.junit.jupiter.api.Test;

public class LoggingServiceTest {

@Test
public void isBinaryPath() {
assertFalse(LoggingService.isBinary(Paths.get("src", "main", "java")));
assertTrue(LoggingService.isBinary(Paths.get("target")));
assertTrue(LoggingService.isBinary(Paths.get("project", "target")));
assertTrue(LoggingService.isBinary(Paths.get("project", "build")));
assertTrue(LoggingService.isBinary(Paths.get("project", "bin")));
}
}

0 comments on commit 04760ce

Please sign in to comment.