Merge pull request appium#266 from TikhomirovSergey/appium#264-fix

TikhomirovSergey · TikhomirovSergey · commit a0c0527ef722 · 2015-11-12T11:20:42.000+03:00
appium#264 fix
diff --git a/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java b/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java
@@ -25,11 +25,15 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public final class AppiumDriverLocalService extends DriverService {
 
     private static final String URL_MASK = "http://%s:%d/wd/hub";
@@ -41,6 +45,7 @@ public final class AppiumDriverLocalService extends DriverService {
     private final long startupTimeout;
     private final TimeUnit timeUnit;
     private final ReentrantLock lock = new ReentrantLock();
+    private final ListOutputStream stream = new ListOutputStream().add(System.out);
 
 
 
@@ -114,7 +119,7 @@ public void start() throws AppiumServerHasNotBeenStartedLocallyException {
         try {
             process = new CommandLine(this.nodeJSExec.getCanonicalPath(), nodeJSArgs.toArray(new String[] {}));
             process.setEnvironmentVariables(nodeJSEnvironment);
-            process.copyOutputTo(System.err);
+            process.copyOutputTo(stream);
             process.executeAsync();
             ping(startupTimeout, timeUnit);
         } catch (Throwable e) {
@@ -162,6 +167,18 @@ public String getStdOut() {
         return null;
     }
 
+    public void addOutPutStream(OutputStream outputStream){
+        checkNotNull(outputStream, "outputStream parameter is NULL!");
+        stream.add(outputStream);
+    }
+
+    public void addOutPutStreams(List<OutputStream> outputStreams){
+        checkNotNull(outputStreams, "outputStreams parameter is NULL!");
+        for (OutputStream stream: outputStreams){
+            addOutPutStream(stream);
+        }
+    }
+
     public static AppiumDriverLocalService buildDefaultService(){
         return buildService(new AppiumServiceBuilder());
     }
diff --git a/src/main/java/io/appium/java_client/service/local/ListOutputStream.java b/src/main/java/io/appium/java_client/service/local/ListOutputStream.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.appium.java_client.service.local;
+
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+class ListOutputStream extends OutputStream {
+
+    private final List<OutputStream> streams = new ArrayList<>();
+
+    ListOutputStream add(OutputStream stream) {
+        streams.add(stream);
+        return this;
+    }
+
+    @Override
+    public void write(int i) throws IOException {
+        for (OutputStream stream: streams) {
+            stream.write(i);
+        }
+    }
+
+    @Override
+    public void write(byte[] var1) throws IOException {
+        for (OutputStream stream: streams) {
+            stream.write(var1, 0, var1.length);
+        }
+    }
+
+    @Override
+    public void write(byte[] var1, int var2, int var3) throws IOException {
+        for (OutputStream stream: streams) {
+            stream.write(var1, var2, var3);
+        }
+    }
+
+    public void flush() throws IOException {
+        for (OutputStream stream: streams) {
+            stream.flush();
+        }
+    }
+
+    public void close() throws IOException {
+        for (OutputStream stream: streams) {
+            stream.close();
+        }
+    }
+}
diff --git a/src/test/java/io/appium/java_client/localserver/ServerBuilderTest.java b/src/test/java/io/appium/java_client/localserver/ServerBuilderTest.java
@@ -26,6 +26,7 @@
 import java.io.*;
 import java.util.Properties;
 
+import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 
 public class ServerBuilderTest {
@@ -135,4 +136,47 @@ public void checkStartingOfTheServiceDefinedExternally(){
         assertEquals(true, service.isRunning());
         service.stop();
     }
+
+    @Test
+    public void checkAbilityToChangeOutputStream() throws Exception{
+        File file = new File("target/test");
+        file.createNewFile();
+        OutputStream stream = new FileOutputStream(file);
+        AppiumDriverLocalService service = AppiumDriverLocalService.buildDefaultService();
+        service.addOutPutStream(stream);
+        try {
+            service.start();
+            assertTrue(file.length() > 0);
+        }
+        finally {
+            service.stop();
+            if (stream != null)
+                stream.close();
+
+            if (file.exists())
+                file.delete();
+        }
+    }
+
+    @Test
+    public void checkAbilityToChangeOutputStreamAfterTheServiceIsStarted() throws Exception{
+        File file = new File("target/test");
+        file.createNewFile();
+        OutputStream stream = new FileOutputStream(file);
+        AppiumDriverLocalService service = AppiumDriverLocalService.buildDefaultService();
+        try {
+            service.start();
+            service.addOutPutStream(stream);
+            service.isRunning();
+            assertTrue(file.length() > 0);
+        }
+        finally {
+            service.stop();
+            if (stream != null)
+                stream.close();
+
+            if (file.exists())
+                file.delete();
+        }
+    }
 }
