Move repeat() to utility class for tests

Avoid depending on AutoCRLFOutputStreamTest from within another
test such as AutoCRLFInputStreamTest. Breaking the dependency up
allows the test classes to be built and executed in parallel.

Change-Id: Ic9ab2b6ec74ac87ff4adda8a802ae343dd2a6235

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoCRLFInputStreamTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoCRLFInputStreamTest.java
index 5975d3787125ccece606aa28cb2519e5762b5f02..83a53b9a6df727a4b38d4a136e1da8a027753043 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoCRLFInputStreamTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoCRLFInputStreamTest.java
@@ -70,9 +70,9 @@ public class AutoCRLFInputStreamTest {
        @Test
        public void testBoundary() throws IOException {
                for (int i = AutoCRLFInputStream.BUFFER_SIZE - 10; i < AutoCRLFInputStream.BUFFER_SIZE + 10; i++) {
-                       String s1 = AutoCRLFOutputStreamTest.repeat("a", i);
+                       String s1 = Strings.repeat("a", i);
                        assertNoCrLf(s1, s1);
-                       String s2 = AutoCRLFOutputStreamTest.repeat("\0", i);
+                       String s2 = Strings.repeat("\0", i);
                        assertNoCrLf(s2, s2);
                }
        }

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoCRLFOutputStreamTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoCRLFOutputStreamTest.java
index 6cb31050f4d48bf03eb7f1d430dbffefa2c21c57..a72d33cd5127581e2401087450e466ea6f591327 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoCRLFOutputStreamTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoCRLFOutputStreamTest.java
@@ -72,21 +72,13 @@ public class AutoCRLFOutputStreamTest {
        @Test
        public void testBoundary() throws IOException {
                for (int i = AutoCRLFOutputStream.BUFFER_SIZE - 10; i < AutoCRLFOutputStream.BUFFER_SIZE + 10; i++) {
-                       String s1 = repeat("a", i);
+                       String s1 = Strings.repeat("a", i);
                        assertNoCrLf(s1, s1);
-                       String s2 = repeat("\0", i);
+                       String s2 = Strings.repeat("\0", i);
                        assertNoCrLf(s2, s2);
                }
        }
 
-       public static String repeat(String input, int size) {
-               StringBuilder sb = new StringBuilder(input.length() * size);
-               for (int i = 0; i < size; i++)
-                       sb.append(input);
-               String s = sb.toString();
-               return s;
-       }
-
        private void assertNoCrLf(String string, String string2) throws IOException {
                assertNoCrLfHelper(string, string2);
                // \u00e5 = LATIN SMALL LETTER A WITH RING ABOVE

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/Strings.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/Strings.java
new file mode 100644 (file)
index 0000000..3d9b054
--- /dev/null
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/Strings.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2011, 2013 Robin Rosenberg
+ * Copyright (C) 2013 Robin Stocker
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ *   names of its contributors may be used to endorse or promote
+ *   products derived from this software without specific prior
+ *   written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.eclipse.jgit.util.io;
+
+class Strings {
+       static String repeat(String input, int size) {
+               StringBuilder sb = new StringBuilder(input.length() * size);
+               for (int i = 0; i < size; i++)
+                       sb.append(input);
+               String s = sb.toString();
+               return s;
+       }
+}