move duplicated NullOutputStream classes to test suite utilities

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1760203 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
index 67ebe1ef00450c145c51d59d9362e9ff06b5bf43..bdd858b06187263c10380791d5843b124d733d14 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
@@ -43,6 +43,7 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.util.NullOutputStream;
 import org.apache.poi.xssf.SXSSFITestDataProvider;
 import org.apache.poi.xssf.XSSFTestDataSamples;
 import org.apache.poi.xssf.model.SharedStringsTable;

diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDump.java b/src/testcases/org/apache/poi/ddf/TestEscherDump.java
index 9b72d9acd21761363cda5bb6a7789a0d36947fe5..95b07452051ce8b065d3bc585f0f423d5ccc6d9f 100644 (file)
--- a/src/testcases/org/apache/poi/ddf/TestEscherDump.java
+++ b/src/testcases/org/apache/poi/ddf/TestEscherDump.java
@@ -20,9 +20,7 @@ package org.apache.poi.ddf;
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 
@@ -30,6 +28,7 @@ import org.apache.poi.POIDataSamples;
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.LocaleUtil;
+import org.apache.poi.util.NullOutputStream;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -83,23 +82,6 @@ public class TestEscherDump {
         @SuppressWarnings("resource")
         private NullPrinterStream() throws UnsupportedEncodingException {
             super(new NullOutputStream(),true,LocaleUtil.CHARSET_1252.name());
-        }
-        /**
-         * Implementation of an OutputStream which does nothing, used
-         * to redirect stdout to avoid spamming the console with output
-         */
-        private static class NullOutputStream extends OutputStream {
-            @Override
-            public void write(byte[] b, int off, int len) {
-            }
-
-            @Override
-            public void write(int b) {
-            }
-
-            @Override
-            public void write(byte[] b) throws IOException {
-            }
-        }        
+        }      
     }    
 }

diff --git a/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java b/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
index 5f471d5b66684bf3a6499ae83eacab459a81b2a2..e69c700deab80591d317f4d902b7ec8eea0f8476 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
+++ b/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,6 +31,7 @@ import java.util.Map;
 import org.apache.poi.POIDataSamples;
 import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.util.NullOutputStream;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -119,22 +119,4 @@ public abstract class BaseXLSIteratingTest {
        }
 
        abstract void runOneFile(File pFile) throws Exception;
-
-       /**
-        * Implementation of an OutputStream which does nothing, used
-        * to redirect stdout to avoid spamming the console with output
-        */
-       private static class NullOutputStream extends OutputStream {
-           @Override
-           public void write(byte[] b, int off, int len) {
-           }
-
-           @Override
-           public void write(int b) {
-           }
-
-           @Override
-           public void write(byte[] b) throws IOException {
-           }
-       }
 }

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
index 6290119f51ad613e5c248dd6f9b1ec162388d75f..52f542281ab95289d85fb78e42b36d265d39ab0a 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
@@ -34,6 +34,7 @@ import java.util.Iterator;
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.ss.ITestDataProvider;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.util.NullOutputStream;
 import org.junit.Test;
 
 public abstract class BaseTestWorkbook {
@@ -781,15 +782,6 @@ public abstract class BaseTestWorkbook {
                }
        }
 
-    protected static class NullOutputStream extends OutputStream {
-        public NullOutputStream() {
-        }
-
-        @Override
-        public void write(int b) throws IOException {
-        }
-    }
-
     @Test
     public void test58499() throws IOException {
         Workbook workbook = _testDataProvider.createWorkbook();

diff --git a/src/testcases/org/apache/poi/util/NullOutputStream.java b/src/testcases/org/apache/poi/util/NullOutputStream.java
new file mode 100644 (file)
index 0000000..ac76123
--- /dev/null
+++ b/src/testcases/org/apache/poi/util/NullOutputStream.java
@@ -0,0 +1,41 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  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 org.apache.poi.util;
+
+import java.io.OutputStream;
+
+/**
+ * Implementation of an OutputStream which does nothing, used
+ * to redirect stdout to avoid spamming the console with output
+ */
+public final class NullOutputStream extends OutputStream {
+    public NullOutputStream() {
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) {
+    }
+
+    @Override
+    public void write(int b) {
+    }
+
+    @Override
+    public void write(byte[] b) {
+    }
+}