Merge pull request #8 from reportportal/develop

Release

CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Awaitility and Hamcrest libraries now declared as `implementation`, by @HardNorth
 
 ## [0.0.3]
+### Changed
+- All dependencies are now declared as `compileOnly`, by @HardNorth
 
 ## [0.0.2]
 ### Changed

build.gradle

@@ -34,10 +34,12 @@ dependencies {
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
     compileOnly 'org.apache.commons:commons-lang3:3.11'
     compileOnly 'org.apache.commons:commons-io:1.3.2'
-    compileOnly('org.awaitility:awaitility:4.0.2') {
+
+    implementation 'org.hamcrest:hamcrest-core:2.2'
+    implementation('org.awaitility:awaitility:4.0.2') {
         exclude group: 'org.hamcrest'
     }
-    compileOnly 'org.hamcrest:hamcrest-core:2.2'
+
 }
 
 release {

src/main/java/com/epam/reportportal/util/test/ProcessUtils.java

@@ -26,6 +26,7 @@
 import javax.annotation.Nullable;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystems;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
@@ -52,7 +53,7 @@ private static String getPathToClass(@Nonnull Class<?> mainClass) {
 	public static Process buildProcess(boolean inheritOutput, @Nonnull Class<?> mainClass,
 			@Nullable Map<String, String> additionalEnvironmentVariables,
 			@Nullable Map<String, String> additionSystemVariables, String... params) throws IOException {
-		String fileSeparator = System.getProperty("file.separator");
+		String fileSeparator = FileSystems.getDefault().getSeparator();
 		String javaHome = System.getProperty("java.home");
 		String executablePath = joinWith(fileSeparator, javaHome, "bin", "java");
 		File executableFile = new File(executablePath);
@@ -136,7 +137,7 @@ public static String waitForLine(final BufferedReader reader, final BufferedRead
 			if (errorReader.ready()) {
 				errorLines = IOUtils.readLines(errorReader);
 			}
-			String lineSeparator = System.getProperty("line.separator");
+			String lineSeparator = System.lineSeparator();
 			throw new IllegalStateException("Unable to run test class: " + String.join(lineSeparator, errorLines));
 		}
 	}

src/main/java/com/epam/reportportal/util/test/SocketUtils.java

@@ -67,7 +67,7 @@ public List<String> call() throws Exception {
 				StringBuilder builder = new StringBuilder();
 				String line;
 				while ((line = in.readLine()) != null) {
-					if (line.equals("")) {
+					if (line.isEmpty()) {
 						break;
 					}
 					builder.append(line);
@@ -96,14 +96,19 @@ public static ServerSocket getServerSocketOnFreePort() throws IOException {
 		return new ServerSocket(0);
 	}
 
-	public static <T> Pair<List<String>, T> executeServerCallable(ServerCallable srvCall, Callable<T> clientCallable) throws Exception {
+	public static <T> Pair<List<String>, T> executeServerCallable(ServerCallable srvCall, Callable<T> clientCallable,
+			long timeoutSeconds) throws Exception {
 		ExecutorService serverExecutor = Executors.newSingleThreadExecutor();
 		Future<List<String>> future = serverExecutor.submit(srvCall);
 		T rs = clientCallable.call();
 		try {
-			return Pair.of(future.get(5, TimeUnit.SECONDS), rs);
+			return Pair.of(future.get(timeoutSeconds, TimeUnit.SECONDS), rs);
 		} finally {
 			CommonUtils.shutdownExecutorService(serverExecutor);
 		}
 	}
+
+	public static <T> Pair<List<String>, T> executeServerCallable(ServerCallable srvCall, Callable<T> clientCallable) throws Exception {
+		return executeServerCallable(srvCall, clientCallable, 5L);
+	}
 }