Fix alphabetical sorting, improve tests to actually cover it (#300)

See https://gitlab.com/oersi/oersi-etl/-/issues/238

Author: fsteeg

metafix/src/main/java/org/metafacture/metafix/MetafixStreamAnalyzer.java

@@ -76,7 +76,7 @@ private TripleCount tripleCount() {
     private TripleSort tripleSort() {
         final TripleSort tripleSort = new TripleSort();
         tripleSort.setNumeric(count);
-        tripleSort.setBy(Compare.OBJECT);
+        tripleSort.setBy(count ? Compare.OBJECT : Compare.SUBJECT);
         tripleSort.setOrder(count ? Order.DECREASING : Order.INCREASING);
         return tripleSort;
     }

metafix/src/test/java/org/metafacture/metafix/MetafixListPathsTest.java

@@ -46,8 +46,8 @@ public MetafixListPathsTest() {
     @Test
     public void testShouldListPaths() {
         verify(
-            "3\t|\tc.*",
-            "2\t|\tb.*",
+            "3\t|\tb.*",
+            "2\t|\tc.*",
             "1\t|\ta");
     }
 
@@ -67,9 +67,9 @@ public void testShouldListPathsUseIndex() {
             "1\t|\ta",
             "1\t|\tb.1",
             "1\t|\tb.2",
+            "1\t|\tb.3",
             "1\t|\tc.1",
-            "1\t|\tc.2",
-            "1\t|\tc.3");
+            "1\t|\tc.2");
     }
 
     @Test
@@ -80,16 +80,16 @@ public void testShouldListPathsNoCountUseIndex() {
             "a",
             "b.1",
             "b.2",
+            "b.3",
             "c.1",
-            "c.2",
-            "c.3");
+            "c.2");
     }
 
     @Test
     public void testShouldListPathsSortedByFrequency() {
         verify(
-            "3\t|\tc.*",
-            "2\t|\tb.*",
+            "3\t|\tb.*",
+            "2\t|\tc.*",
             "1\t|\ta");
     }
 
@@ -99,7 +99,7 @@ private void processRecord() {
         lister.literal("a", "");
         lister.literal("b", "");
         lister.literal("b", "");
-        lister.literal("c", "");
+        lister.literal("b", "");
         lister.literal("c", "");
         lister.literal("c", "");
         lister.endRecord();
@@ -113,6 +113,9 @@ private void verify(final String... result) throws MockitoAssertionError {
             for (final String r : result) {
                 ordered.verify(receiver).process(r);
             }
+            ordered.verify(receiver, Mockito.times(2)).closeStream();
+            ordered.verifyNoMoreInteractions();
+            Mockito.verifyNoMoreInteractions(receiver);
         }
         catch (final MockitoAssertionError e) {
             System.out.println(Mockito.mockingDetails(receiver).printInvocations());