Fix SshKeysDispatcher test failing on Windows

The `SshKeysDispatcher` tests that use the keys list command are failing
on Windows because they assume a Unix line ending after each key. But
the command will use a system line ending. So this fix uses system line
endings in the reference string for the assert, too.

In addition, two `assertTrue(false)´ are replaced with a proper `fail`.

diff --git a/src/test/java/com/gitblit/tests/SshKeysDispatcherTest.java b/src/test/java/com/gitblit/tests/SshKeysDispatcherTest.java
index 23e6179526b5f6e98b8140a0912071c78e0461ea..4784e46858c366388833eed27b65425fabc3d433 100644 (file)
--- a/src/test/java/com/gitblit/tests/SshKeysDispatcherTest.java
+++ b/src/test/java/com/gitblit/tests/SshKeysDispatcherTest.java
@@ -37,7 +37,7 @@ public class SshKeysDispatcherTest extends SshUnitTest {
                String result = testSshCommand("keys ls -L");
                List<SshKey> keys = getKeyManager().getKeys(username);
                assertEquals(String.format("There are %d keys!", keys.size()), 2, keys.size());
-               assertEquals(keys.get(0).getRawData() + "\n" + keys.get(1).getRawData(), result);
+               assertEquals(String.format("%s%n%s", keys.get(0).getRawData(), keys.get(1).getRawData()), result);
        }
 
        @Test
@@ -64,9 +64,9 @@ public class SshKeysDispatcherTest extends SshUnitTest {
                assertEquals(String.format("There are %d keys!", keys.size()), 0, keys.size());
                try {
                        testSshCommand("keys ls -L");
-                       assertTrue("Authentication worked without a public key?!", false);
+                       fail("Authentication worked without a public key?!");
                } catch (AssertionError e) {
-                       assertTrue(true);
+                       // expected
                }
        }
 
@@ -77,9 +77,9 @@ public class SshKeysDispatcherTest extends SshUnitTest {
                assertEquals(String.format("There are %d keys!", keys.size()), 0, keys.size());
                try {
                        testSshCommand("keys ls -L");
-                       assertTrue("Authentication worked without a public key?!", false);
+                       fail("Authentication worked without a public key?!");
                } catch (AssertionError e) {
-                       assertTrue(true);
+                       // expected
                }
        }
 
@@ -96,9 +96,9 @@ public class SshKeysDispatcherTest extends SshUnitTest {
                StringBuilder sb = new StringBuilder();
                for (SshKey sk : keys) {
                        sb.append(sk.getRawData());
-                       sb.append('\n');
+                       sb.append(System.getProperty("line.separator", "\n"));
                }
-               sb.setLength(sb.length() - 1);
+               sb.setLength(sb.length() - System.getProperty("line.separator", "\n").length());
                assertEquals(sb.toString(), result);
        }