From 24d8c8305065770ad0d6abdc3668f595280bb27e Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Sat, 13 May 2023 11:49:02 +0200 Subject: [PATCH] Increase Copyright year from 2018 to 2023 --- .../exec/CheckingConsoleOutputStream.java | 2 +- .../exec/CompositeExecuteResultHandler.java | 20 +++++----- .../exec/LoggingExecuteResultHandler.java | 9 ++--- .../LoggingShutdownHookProcessDestroyer.java | 5 +-- .../ch/vorburger/exec/ManagedProcess.java | 17 +++++---- .../vorburger/exec/ManagedProcessBuilder.java | 8 ++-- .../exec/ManagedProcessException.java | 2 +- .../exec/ManagedProcessListener.java | 2 +- .../exec/ManagedProcessListenerInternal.java | 5 +-- .../vorburger/exec/ManagedProcessState.java | 2 +- .../vorburger/exec/MultiCauseIOException.java | 2 +- .../ch/vorburger/exec/MultiOutputStream.java | 5 ++- .../exec/OutputStreamLogDispatcher.java | 2 +- .../ch/vorburger/exec/OutputStreamType.java | 2 +- .../vorburger/exec/ProcessResultHandler.java | 2 +- .../exec/RollingLogOutputStream.java | 3 +- .../vorburger/exec/SLF4jLogOutputStream.java | 5 ++- .../exec/StopCheckExecuteWatchdog.java | 2 +- .../java/ch/vorburger/exec/package-info.java | 2 +- .../exec/ManagedProcessBuilderTest.java | 3 +- .../ch/vorburger/exec/ManagedProcessTest.java | 37 ++++++++++++------- 21 files changed, 75 insertions(+), 62 deletions(-) diff --git a/src/main/java/ch/vorburger/exec/CheckingConsoleOutputStream.java b/src/main/java/ch/vorburger/exec/CheckingConsoleOutputStream.java index f11dbdb..6075135 100644 --- a/src/main/java/ch/vorburger/exec/CheckingConsoleOutputStream.java +++ b/src/main/java/ch/vorburger/exec/CheckingConsoleOutputStream.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ch/vorburger/exec/CompositeExecuteResultHandler.java b/src/main/java/ch/vorburger/exec/CompositeExecuteResultHandler.java index 238e6aa..9476c13 100644 --- a/src/main/java/ch/vorburger/exec/CompositeExecuteResultHandler.java +++ b/src/main/java/ch/vorburger/exec/CompositeExecuteResultHandler.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,25 +19,25 @@ */ package ch.vorburger.exec; +import static java.util.Objects.requireNonNull; + +import java.lang.invoke.MethodHandles; +import java.util.ArrayList; +import java.util.List; import org.apache.commons.exec.DefaultExecuteResultHandler; import org.apache.commons.exec.ExecuteException; import org.apache.commons.exec.ExecuteResultHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.invoke.MethodHandles; -import java.util.ArrayList; -import java.util.List; - -import static java.util.Objects.requireNonNull; - class CompositeExecuteResultHandler extends DefaultExecuteResultHandler { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private final List handlers; private final ManagedProcessState managedProcessState; - public CompositeExecuteResultHandler(ManagedProcessState managedProcessState, List handlers) { + public CompositeExecuteResultHandler(ManagedProcessState managedProcessState, + List handlers) { super(); this.managedProcessState = requireNonNull(managedProcessState, "managedProcessState can't be null"); this.handlers = new ArrayList<>(handlers); @@ -50,7 +50,7 @@ public void onProcessComplete(int exitValue) { try { handler.onProcessComplete(exitValue); } catch (Exception e) { - logger.error(managedProcessState.getProcLongName() + " process handler failed on processComplete",e); + logger.error(managedProcessState.getProcLongName() + " process handler failed on processComplete", e); } } } @@ -62,7 +62,7 @@ public void onProcessFailed(ExecuteException processFailedException) { try { handler.onProcessFailed(processFailedException); } catch (Exception e) { - logger.error(managedProcessState.getProcLongName() + " process handler failed on processComplete",e); + logger.error(managedProcessState.getProcLongName() + " process handler failed on processComplete", e); } } } diff --git a/src/main/java/ch/vorburger/exec/LoggingExecuteResultHandler.java b/src/main/java/ch/vorburger/exec/LoggingExecuteResultHandler.java index 94b2d8a..b4b50c3 100644 --- a/src/main/java/ch/vorburger/exec/LoggingExecuteResultHandler.java +++ b/src/main/java/ch/vorburger/exec/LoggingExecuteResultHandler.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,15 +19,14 @@ */ package ch.vorburger.exec; +import static java.util.Objects.requireNonNull; + +import java.lang.invoke.MethodHandles; import org.apache.commons.exec.DefaultExecuteResultHandler; import org.apache.commons.exec.ExecuteException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.invoke.MethodHandles; - -import static java.util.Objects.requireNonNull; - /** * Extends Commons Exec's {@link DefaultExecuteResultHandler} with logging and notify state to initializing class. */ diff --git a/src/main/java/ch/vorburger/exec/LoggingShutdownHookProcessDestroyer.java b/src/main/java/ch/vorburger/exec/LoggingShutdownHookProcessDestroyer.java index 29781d3..171f9a5 100644 --- a/src/main/java/ch/vorburger/exec/LoggingShutdownHookProcessDestroyer.java +++ b/src/main/java/ch/vorburger/exec/LoggingShutdownHookProcessDestroyer.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,11 @@ */ package ch.vorburger.exec; +import java.lang.invoke.MethodHandles; import org.apache.commons.exec.ShutdownHookProcessDestroyer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.invoke.MethodHandles; - public class LoggingShutdownHookProcessDestroyer extends ShutdownHookProcessDestroyer { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/src/main/java/ch/vorburger/exec/ManagedProcess.java b/src/main/java/ch/vorburger/exec/ManagedProcess.java index 9967bfb..4a74c43 100644 --- a/src/main/java/ch/vorburger/exec/ManagedProcess.java +++ b/src/main/java/ch/vorburger/exec/ManagedProcess.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ import java.util.Arrays; import java.util.List; import java.util.Map; - import org.apache.commons.exec.CommandLine; import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.ExecuteException; @@ -102,7 +101,8 @@ public class ManagedProcess implements ManagedProcessState { * @param listener ManagedProcessListener */ ManagedProcess(CommandLine commandLine, File directory, Map environment, - InputStream input, boolean destroyOnShutdown, int consoleBufferMaxLines, OutputStreamLogDispatcher outputStreamLogDispatcher, + InputStream input, boolean destroyOnShutdown, int consoleBufferMaxLines, + OutputStreamLogDispatcher outputStreamLogDispatcher, List stdOuts, List stderr, ManagedProcessListener listener) { this.commandLine = commandLine; this.environment = environment; @@ -120,7 +120,8 @@ public class ManagedProcess implements ManagedProcessState { this.destroyOnShutdown = destroyOnShutdown; this.consoleBufferMaxLines = consoleBufferMaxLines; this.outputStreamLogDispatcher = outputStreamLogDispatcher; - this.resultHandler = new CompositeExecuteResultHandler(this, Arrays.asList(new LoggingExecuteResultHandler(this), new ProcessResultHandler(listener))); + this.resultHandler = new CompositeExecuteResultHandler(this, + Arrays.asList(new LoggingExecuteResultHandler(this), new ProcessResultHandler(listener))); this.stdouts = new MultiOutputStream(); this.stderrs = new MultiOutputStream(); for (OutputStream stdOut : stdOuts) { @@ -250,7 +251,8 @@ public boolean startAndWaitForConsoleMessageMaxMs(String messageInConsole, final int SLEEP_TIME_MS = 50; logger.info( "Thread will wait for \"{}\" to appear in Console output of process {} for max. " - + maxWaitUntilReturning + "ms", messageInConsole, getProcLongName()); + + maxWaitUntilReturning + "ms", + messageInConsole, getProcLongName()); startExecute(); @@ -516,7 +518,8 @@ private String getProcShortName() { public String getProcLongName() { return "Program " + commandLine.toString() - + (executor.getWorkingDirectory() == null ? "" : " (in working directory " - + executor.getWorkingDirectory().getAbsolutePath() + ")"); + + (executor.getWorkingDirectory() == null ? "" + : " (in working directory " + + executor.getWorkingDirectory().getAbsolutePath() + ")"); } } diff --git a/src/main/java/ch/vorburger/exec/ManagedProcessBuilder.java b/src/main/java/ch/vorburger/exec/ManagedProcessBuilder.java index fb6fe74..f6b31fa 100644 --- a/src/main/java/ch/vorburger/exec/ManagedProcessBuilder.java +++ b/src/main/java/ch/vorburger/exec/ManagedProcessBuilder.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -234,7 +234,8 @@ public OutputStreamLogDispatcher getOutputStreamLogDispatcher() { // ---- public ManagedProcess build() { - return new ManagedProcess(getCommandLine(), directory, environment, inputStream, destroyOnShutdown, consoleBufferMaxLines, + return new ManagedProcess(getCommandLine(), directory, environment, inputStream, destroyOnShutdown, + consoleBufferMaxLines, outputStreamLogDispatcher, stdOuts, stdErrs, listener); } @@ -274,7 +275,8 @@ CommandLine getCommandLine() { /** * Intended for debugging / logging, only. */ - @Override public String toString() { + @Override + public String toString() { return commonsExecCommandLine.toString(); } diff --git a/src/main/java/ch/vorburger/exec/ManagedProcessException.java b/src/main/java/ch/vorburger/exec/ManagedProcessException.java index 02d10d7..1dba7c5 100644 --- a/src/main/java/ch/vorburger/exec/ManagedProcessException.java +++ b/src/main/java/ch/vorburger/exec/ManagedProcessException.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ch/vorburger/exec/ManagedProcessListener.java b/src/main/java/ch/vorburger/exec/ManagedProcessListener.java index 3f4a60a..99097f9 100644 --- a/src/main/java/ch/vorburger/exec/ManagedProcessListener.java +++ b/src/main/java/ch/vorburger/exec/ManagedProcessListener.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ch/vorburger/exec/ManagedProcessListenerInternal.java b/src/main/java/ch/vorburger/exec/ManagedProcessListenerInternal.java index 64d8a36..3d36e5d 100644 --- a/src/main/java/ch/vorburger/exec/ManagedProcessListenerInternal.java +++ b/src/main/java/ch/vorburger/exec/ManagedProcessListenerInternal.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,11 +19,10 @@ */ package ch.vorburger.exec; +import java.lang.invoke.MethodHandles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.invoke.MethodHandles; - /** * Internal Listener that just provides debug info if ManagedProcessListener is not set externally */ diff --git a/src/main/java/ch/vorburger/exec/ManagedProcessState.java b/src/main/java/ch/vorburger/exec/ManagedProcessState.java index f99553e..bfb55db 100644 --- a/src/main/java/ch/vorburger/exec/ManagedProcessState.java +++ b/src/main/java/ch/vorburger/exec/ManagedProcessState.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ch/vorburger/exec/MultiCauseIOException.java b/src/main/java/ch/vorburger/exec/MultiCauseIOException.java index bc9e778..58c1bca 100644 --- a/src/main/java/ch/vorburger/exec/MultiCauseIOException.java +++ b/src/main/java/ch/vorburger/exec/MultiCauseIOException.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ch/vorburger/exec/MultiOutputStream.java b/src/main/java/ch/vorburger/exec/MultiOutputStream.java index 2a6c950..672cd9f 100644 --- a/src/main/java/ch/vorburger/exec/MultiOutputStream.java +++ b/src/main/java/ch/vorburger/exec/MultiOutputStream.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,8 @@ public class MultiOutputStream extends OutputStream { protected final List streams = new LinkedList<>(); - public MultiOutputStream() {} + public MultiOutputStream() { + } public MultiOutputStream(OutputStream... delegates) { for (OutputStream delegate : delegates) { diff --git a/src/main/java/ch/vorburger/exec/OutputStreamLogDispatcher.java b/src/main/java/ch/vorburger/exec/OutputStreamLogDispatcher.java index 9d88da7..6676ade 100644 --- a/src/main/java/ch/vorburger/exec/OutputStreamLogDispatcher.java +++ b/src/main/java/ch/vorburger/exec/OutputStreamLogDispatcher.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2016 - 2018 Michael Vorburger + * Copyright (C) 2016 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ch/vorburger/exec/OutputStreamType.java b/src/main/java/ch/vorburger/exec/OutputStreamType.java index 2511a8e..70b0f9d 100644 --- a/src/main/java/ch/vorburger/exec/OutputStreamType.java +++ b/src/main/java/ch/vorburger/exec/OutputStreamType.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2016 - 2018 Michael Vorburger + * Copyright (C) 2016 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ch/vorburger/exec/ProcessResultHandler.java b/src/main/java/ch/vorburger/exec/ProcessResultHandler.java index f57e44e..d331afa 100644 --- a/src/main/java/ch/vorburger/exec/ProcessResultHandler.java +++ b/src/main/java/ch/vorburger/exec/ProcessResultHandler.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ch/vorburger/exec/RollingLogOutputStream.java b/src/main/java/ch/vorburger/exec/RollingLogOutputStream.java index 513f18f..f228973 100644 --- a/src/main/java/ch/vorburger/exec/RollingLogOutputStream.java +++ b/src/main/java/ch/vorburger/exec/RollingLogOutputStream.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ package ch.vorburger.exec; import java.util.Collection; - import org.apache.commons.collections4.queue.CircularFifoQueue; import org.apache.commons.exec.LogOutputStream; diff --git a/src/main/java/ch/vorburger/exec/SLF4jLogOutputStream.java b/src/main/java/ch/vorburger/exec/SLF4jLogOutputStream.java index 5e5e72f..278a19b 100644 --- a/src/main/java/ch/vorburger/exec/SLF4jLogOutputStream.java +++ b/src/main/java/ch/vorburger/exec/SLF4jLogOutputStream.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,8 @@ class SLF4jLogOutputStream extends LogOutputStream { private final OutputStreamType type; private final String pid; - protected SLF4jLogOutputStream(Logger logger, String pid, OutputStreamType type, OutputStreamLogDispatcher dispatcher) { + protected SLF4jLogOutputStream(Logger logger, String pid, OutputStreamType type, + OutputStreamLogDispatcher dispatcher) { this.dispatcher = dispatcher; this.logger = logger; this.type = type; diff --git a/src/main/java/ch/vorburger/exec/StopCheckExecuteWatchdog.java b/src/main/java/ch/vorburger/exec/StopCheckExecuteWatchdog.java index c5b6e17..27e189c 100644 --- a/src/main/java/ch/vorburger/exec/StopCheckExecuteWatchdog.java +++ b/src/main/java/ch/vorburger/exec/StopCheckExecuteWatchdog.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ch/vorburger/exec/package-info.java b/src/main/java/ch/vorburger/exec/package-info.java index c69dd58..bb06626 100644 --- a/src/main/java/ch/vorburger/exec/package-info.java +++ b/src/main/java/ch/vorburger/exec/package-info.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2015 - 2018 Michael Vorburger + * Copyright (C) 2015 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/ch/vorburger/exec/ManagedProcessBuilderTest.java b/src/test/java/ch/vorburger/exec/ManagedProcessBuilderTest.java index d86d0d7..03982f3 100644 --- a/src/test/java/ch/vorburger/exec/ManagedProcessBuilderTest.java +++ b/src/test/java/ch/vorburger/exec/ManagedProcessBuilderTest.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ import static org.junit.Assert.assertTrue; import java.io.File; - import org.apache.commons.lang3.SystemUtils; import org.junit.Test; diff --git a/src/test/java/ch/vorburger/exec/ManagedProcessTest.java b/src/test/java/ch/vorburger/exec/ManagedProcessTest.java index 50d035b..6d3d032 100644 --- a/src/test/java/ch/vorburger/exec/ManagedProcessTest.java +++ b/src/test/java/ch/vorburger/exec/ManagedProcessTest.java @@ -2,7 +2,7 @@ * #%L * ch.vorburger.exec * %% - * Copyright (C) 2012 - 2018 Michael Vorburger + * Copyright (C) 2012 - 2023 Michael Vorburger * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,13 @@ package ch.vorburger.exec; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.apache.commons.lang3.SystemUtils; import org.junit.Assert; @@ -39,8 +45,8 @@ public void onProcessCompleteInvokedOnCustomListener() throws Exception { SomeSelfTerminatingExec exec = someSelfTerminatingExec(listener); exec.proc.startAndWaitForConsoleMessageMaxMs(exec.msgToWaitFor, 1000); - assertNotEquals(Integer.MIN_VALUE,listener.successExitValue); - assertEquals(Integer.MIN_VALUE,listener.failureExitValue); + assertNotEquals(Integer.MIN_VALUE, listener.successExitValue); + assertEquals(Integer.MIN_VALUE, listener.failureExitValue); assertNull(listener.t); } @@ -52,11 +58,11 @@ public void onProcessFailedInvokedOnCustomListener() throws Exception { try { exec.proc.startAndWaitForConsoleMessageMaxMs(exec.msgToWaitFor, 1000); fail("Process expected to fail. Should've thrown a ManagedProcessException"); - } catch(ManagedProcessException e) { + } catch (ManagedProcessException e) { } - assertEquals(Integer.MIN_VALUE,listener.successExitValue); - assertNotEquals(Integer.MIN_VALUE,listener.failureExitValue); + assertEquals(Integer.MIN_VALUE, listener.successExitValue); + assertNotEquals(Integer.MIN_VALUE, listener.failureExitValue); assertNotNull(listener.t); } @@ -98,7 +104,8 @@ public void testBasics() throws Exception { } try { p.waitForExitMaxMsOrDestroy(1234); - Assert.fail("ManagedProcess.waitForExitMaxMsOrDestroy(1234) should have thrown a ManagedProcessException here"); + Assert.fail( + "ManagedProcess.waitForExitMaxMsOrDestroy(1234) should have thrown a ManagedProcessException here"); } catch (@SuppressWarnings("unused") ManagedProcessException e) { // as expected } @@ -172,7 +179,8 @@ protected SomeSelfTerminatingExec someSelfTerminatingExec() throws ManagedProces return someSelfTerminatingExec(null); } - protected SomeSelfTerminatingExec someSelfTerminatingExec(ManagedProcessListener listener) throws ManagedProcessException { + protected SomeSelfTerminatingExec someSelfTerminatingExec(ManagedProcessListener listener) + throws ManagedProcessException { SomeSelfTerminatingExec r = new SomeSelfTerminatingExec(); if (SystemUtils.IS_OS_WINDOWS) { r.proc = new ManagedProcessBuilder("cmd.exe").addArgument("/C").addArgument("dir").addArgument("/X") @@ -182,8 +190,10 @@ protected SomeSelfTerminatingExec someSelfTerminatingExec(ManagedProcessListener r.proc = new ManagedProcessBuilder("true").addArgument("--version").setProcessListener(listener).build(); r.msgToWaitFor = "true (GNU coreutils)"; } else if (SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC) { - r.proc = new ManagedProcessBuilder("echo").addArgument("\"Lorem ipsum dolor sit amet, consectetur adipisci elit, " - + " sed eiusmod tempor incidunt ut \nlabore et dolore magna aliqua.\"").setProcessListener(listener).build(); + r.proc = new ManagedProcessBuilder("echo") + .addArgument("\"Lorem ipsum dolor sit amet, consectetur adipisci elit, " + + " sed eiusmod tempor incidunt ut \nlabore et dolore magna aliqua.\"") + .setProcessListener(listener).build(); r.msgToWaitFor = "incidunt"; } else { throw new ManagedProcessException("Unexpected Platform, improve the test dude..."); @@ -192,7 +202,8 @@ protected SomeSelfTerminatingExec someSelfTerminatingExec(ManagedProcessListener return r; } - protected SomeSelfTerminatingExec someSelfTerminatingFailingExec(ManagedProcessListener listener) throws ManagedProcessException { + protected SomeSelfTerminatingExec someSelfTerminatingFailingExec(ManagedProcessListener listener) + throws ManagedProcessException { SomeSelfTerminatingExec r = new SomeSelfTerminatingExec(); if (SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_MAC) { r.proc = new ManagedProcessBuilder("ls").addArgument("-4").setProcessListener(listener).build(); @@ -226,7 +237,7 @@ public void testMustTerminateExec() throws Exception { // can not: p.exitValue(); } - class TestListener implements ManagedProcessListener{ + class TestListener implements ManagedProcessListener { int successExitValue = Integer.MIN_VALUE; int failureExitValue = Integer.MIN_VALUE; Throwable t;