From 99acaa9bfaf22848eb76bd744e4ee2f87fa6bcd6 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Wed, 6 Jun 2012 09:00:13 -0700
Subject: [PATCH] Fix tests revealed to be failing * UriUtils.java    
 isLikelyFalsePositive() - do not flag urls starting with ../ as likely false
 positives * UriUtilsTest.java     remove test url that is now rejected

---
 commons/src/main/java/org/archive/util/UriUtils.java     | 3 +--
 commons/src/test/java/org/archive/util/UriUtilsTest.java | 8 +-------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/commons/src/main/java/org/archive/util/UriUtils.java b/commons/src/main/java/org/archive/util/UriUtils.java
index 8691333a..8e01850b 100644
--- a/commons/src/main/java/org/archive/util/UriUtils.java
+++ b/commons/src/main/java/org/archive/util/UriUtils.java
@@ -273,8 +273,7 @@ public class UriUtils {
             }
             return true;
         }
-
-        if (TextUtils.matches("^\\.\\.?[^/].*", candidate)) {
+        if (candidate.charAt(0) == '.' && !TextUtils.matches("^\\.{1,2}/.*", candidate)) {
             if (LOGGER.isLoggable(Level.FINE)) {
                 LOGGER.fine("rejected: starts with '.' (but not './' or '../'): " + candidate);
             }
diff --git a/commons/src/test/java/org/archive/util/UriUtilsTest.java b/commons/src/test/java/org/archive/util/UriUtilsTest.java
index 0ef1d676..3db3d6c0 100644
--- a/commons/src/test/java/org/archive/util/UriUtilsTest.java
+++ b/commons/src/test/java/org/archive/util/UriUtilsTest.java
@@ -110,7 +110,6 @@ public class UriUtilsTest extends TestCase {
         "cssp!gelui-1/overlay",
         "/wiki/%E0%B4%B8%E0%B4%B9%E0%B4%BE%E0%B4%AF%E0%B4%82:To_Read_in_Malayalam",
         "/wiki/Wikiversity:Why_create_an_account%3F",
-        ";s.channel=d.channel?d.channel:"
     };
     public void testRelatives() {
         tryAll(urisRelative, true);
@@ -237,12 +236,7 @@ public class UriUtilsTest extends TestCase {
      */
     protected void tryAll(String[] candidates, boolean expected) {
         for (String candidate : candidates) {
-            assertEquals("new: " + candidate, 
-                    expected, 
-                    UriUtils.isLikelyUri(candidate));
-            assertEquals("html context: " + candidate, 
-                    expected, 
-                    UriUtils.isLikelyUri(candidate));
+            assertEquals(candidate, expected, UriUtils.isLikelyUri(candidate));
         }
     }
 }