You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/02/24 11:27:38 UTC

git commit: [KARAF-2785] proper sorting to stdout (tests included)

Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x 9bda7f5e0 -> db336fe6c


[KARAF-2785] proper sorting to stdout (tests included)


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/db336fe6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/db336fe6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/db336fe6

Branch: refs/heads/karaf-2.x
Commit: db336fe6caa5e20b318b9030eba5ce8e9bbb56aa
Parents: 9bda7f5
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Mon Feb 24 09:37:01 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Feb 24 11:23:25 2014 +0100

----------------------------------------------------------------------
 .../apache/karaf/shell/commands/SortAction.java |  5 ++--
 .../apache/karaf/shell/commands/SortTest.java   | 26 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/db336fe6/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java
index 3166355..b4f0752 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/SortAction.java
@@ -126,11 +126,10 @@ public class SortAction extends AbstractAction {
         Collections.sort(strings, new SortComparator(caseInsensitive, reverse, ignoreBlanks, numeric, sep, sortFields));
         String last = null;
         for (String s : strings) {
-            if (last == null) {
-                last = s;
-            } else if (!unique || !s.equals(last)) {
+            if (!unique || last == null || !s.equals(last)) {
                 out.println(s);
             }
+            last = s;
         }
     }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/db336fe6/shell/commands/src/test/java/org/apache/karaf/shell/commands/SortTest.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/test/java/org/apache/karaf/shell/commands/SortTest.java b/shell/commands/src/test/java/org/apache/karaf/shell/commands/SortTest.java
index 11a1a61..69048e8 100644
--- a/shell/commands/src/test/java/org/apache/karaf/shell/commands/SortTest.java
+++ b/shell/commands/src/test/java/org/apache/karaf/shell/commands/SortTest.java
@@ -18,6 +18,10 @@
  */
 package org.apache.karaf.shell.commands;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Collections;
@@ -60,4 +64,26 @@ public class SortTest extends TestCase {
         assertTrue(Arrays.asList(s2, s1, s0).equals(strings));
     }
 
+    public void testSortToStdout() throws Exception {
+        String newLine = System.getProperty("line.separator");
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        byte[] input = ("abc" + newLine + "def" + newLine).getBytes();
+        new SortAction().sort(new ByteArrayInputStream(input), new PrintStream(baos));
+        assertEquals(new String(input), new String(baos.toByteArray()));
+    }
+
+    public void testUniqSortToStdout() throws Exception {
+        String newLine = System.getProperty("line.separator");
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        String inputString = "def" + newLine + "def" + newLine + "abc" + newLine + "abc" + newLine + "def" + newLine;
+        byte[] input = inputString.getBytes();
+        String outputString = ("abc" + newLine + "def" + newLine);
+        SortAction sort = new SortAction();
+        Field unique = SortAction.class.getDeclaredField("unique");
+        unique.setAccessible(true);
+        unique.set(sort, true);
+        sort.sort(new ByteArrayInputStream(input), new PrintStream(baos));
+        assertEquals(outputString, new String(baos.toByteArray()));
+    }
+
 }