[metrics-lib/master] Update unit tests for 17943b0. - tor-commits

1 Aug 2016

commit 6ac45212ce6a262235c2bc889fb2d981dc18e70c
Author: Karsten Loesing karsten.loesing@gmx.net
Date:   Mon Aug 1 14:38:01 2016 +0200
Update unit tests for 17943b0.
---
 .../impl/DescriptorCollectorImplTest.java          | 26 +++++-----------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java
index 4355888..77fb259 100644
--- a/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java
+++ b/src/test/java/org/torproject/descriptor/impl/DescriptorCollectorImplTest.java
@@ -24,7 +24,7 @@ public class DescriptorCollectorImplTest {
         + "<img src="/icons/unknown.gif" alt="[   ]"></td><td>"
         + "<a href="" + remoteFilename + "">"
         + "2015-05-24-12-00-00-consensus</a></td>"
-        + "<td align="right">24-May-2015 12:08  </td>"
+        + "<td align="right">2015-05-24 12:08  </td>"
         + "<td align="right">1.5M</td><td>&nbsp;</td></tr>";
     SortedMap<String, Long> remoteFiles =
         new DescriptorCollectorImpl().parseDirectoryListing(
@@ -40,8 +40,8 @@ public class DescriptorCollectorImplTest {
   @Test()
   public void testSameFileTwoTimestampsLastWins() {
     String remoteFilename = "2015-05-24-12-00-00-consensus";
-    String firstTimestamp = "24-May-2015 12:04";
-    String secondTimestamp = "24-May-2015 12:08";
+    String firstTimestamp = "2015-05-24 12:04";
+    String secondTimestamp = "2015-05-24 12:08";
     String lineFormat = "<tr><td valign="top">"
         + "<img src="/icons/unknown.gif" alt="[   ]"></td><td>"
         + "<a href="%s">2015-05-24-12-00-00-consensus</a></td>"
@@ -65,7 +65,7 @@ public class DescriptorCollectorImplTest {
     String directoryListing = "<tr><td valign="top">"
         + "<img src="/icons/folder.gif" alt="[DIR]"></td><td>"
         + "<a href="subdir/">subdir/</a></td>"
-        + "<td align="right">27-May-2015 14:07  </td>"
+        + "<td align="right">2015-05-27 14:07  </td>"
         + "<td align="right">  - </td><td>&nbsp;</td></tr>";
     DescriptorCollectorImpl collector = new DescriptorCollectorImpl();
     SortedMap<String, Long> remoteFiles = collector.parseDirectoryListing(
@@ -94,7 +94,7 @@ public class DescriptorCollectorImplTest {
         + "<img src="/icons/unknown.gif" alt="[   ]"></td><td>"
         + "<a href="2015-05-24-12-00-00-consensus">"
         + "2015-05-24-12-00-00-consensus</a></td>"
-        + "<td align="right">2015-05-24 12:08  </td>"
+        + "<td align="right">24-May-2015 12:08  </td>"
         + "<td align="right">1.5M</td><td>&nbsp;</td></tr>";
     SortedMap<String, Long> remoteFiles =
         new DescriptorCollectorImpl().parseDirectoryListing(
@@ -109,21 +109,7 @@ public class DescriptorCollectorImplTest {
         + "<img src="/icons/unknown.gif" alt="[   ]"></td><td>"
         + "<a href="2015-05-24-12-00-00-consensus">"
         + "2015-05-24-12-00-00-consensus</a></td>"
-        + "<td align="right">34-May-2015 12:08  </td>"
-        + "<td align="right">1.5M</td><td>&nbsp;</td></tr>";
-    SortedMap<String, Long> remoteFiles =
-        new DescriptorCollectorImpl().parseDirectoryListing(
-        REMOTE_DIRECTORY_CONSENSUSES, directoryListing);
-    assertNull(remoteFiles);
-  }
-
-  @Test()
-  public void testInvalidLocaleDe() {
-    String directoryListing = "<tr><td valign="top">"
-        + "<img src="/icons/unknown.gif" alt="[   ]"></td><td>"
-        + "<a href="2015-05-24-12-00-00-consensus">"
-        + "2015-05-24-12-00-00-consensus</a></td>"
-        + "<td align="right">24-Mai-2015 12:08  </td>"
+        + "<td align="right">2015-05-34 12:08  </td>"
         + "<td align="right">1.5M</td><td>&nbsp;</td></tr>";
     SortedMap<String, Long> remoteFiles =
         new DescriptorCollectorImpl().parseDirectoryListing(

    