From 91c64ff08b248bdd6f77ab6263573976c63d4eab Mon Sep 17 00:00:00 2001 From: Pablo Fernandez Date: Thu, 14 Oct 2010 14:19:53 -0300 Subject: [PATCH] Added support for dash/underscore in custom URLs --- src/main/java/org/scribe/utils/Preconditions.java | 2 +- src/test/java/org/scribe/utils/PreconditionsTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/scribe/utils/Preconditions.java b/src/main/java/org/scribe/utils/Preconditions.java index 06bd151..f63a20e 100644 --- a/src/main/java/org/scribe/utils/Preconditions.java +++ b/src/main/java/org/scribe/utils/Preconditions.java @@ -7,7 +7,7 @@ import org.scribe.model.OAuthConstants; public class Preconditions { private static final String DEFAULT_MESSAGE = "Received an invalid parameter"; - private static final Pattern URL_PATTERN = Pattern.compile("[a-zA-Z]+://\\S+"); + private static final Pattern URL_PATTERN = Pattern.compile("[a-zA-Z_-]+://\\S+"); public static void checkNotNull(Object object, String errorMsg) { diff --git a/src/test/java/org/scribe/utils/PreconditionsTest.java b/src/test/java/org/scribe/utils/PreconditionsTest.java index 0add2f6..54ec9f8 100644 --- a/src/test/java/org/scribe/utils/PreconditionsTest.java +++ b/src/test/java/org/scribe/utils/PreconditionsTest.java @@ -55,13 +55,13 @@ public class PreconditionsTest public void shouldAllowNonStandarProtocolsForAndroid() { - Preconditions.checkValidUrl("myUrl://www.example.com", ERROR_MSG); + Preconditions.checkValidUrl("x-url-custom://www.example.com", ERROR_MSG); } @Test(expected = IllegalArgumentException.class) public void shouldNotAllowStrangeProtocolNames() { - Preconditions.checkValidUrl("_weird*://www.example.com", ERROR_MSG); + Preconditions.checkValidUrl("$weird*://www.example.com", ERROR_MSG); } public void shouldAllowOutOfBandAsValidCallbackValue()