This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-validator.git
The following commit(s) were added to refs/heads/master by this push: new fa66422 Move test code to test area fa66422 is described below commit fa66422bd41d6c36fa1dd13d2602d45bcdc96912 Author: Sebb <s...@apache.org> AuthorDate: Tue Jul 28 21:53:12 2020 +0100 Move test code to test area --- .../commons/validator/routines/UrlValidator.java | 33 -------------------- .../validator/routines/UrlValidatorTest.java | 35 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/apache/commons/validator/routines/UrlValidator.java b/src/main/java/org/apache/commons/validator/routines/UrlValidator.java index 74b0d30..03799ff 100644 --- a/src/main/java/org/apache/commons/validator/routines/UrlValidator.java +++ b/src/main/java/org/apache/commons/validator/routines/UrlValidator.java @@ -549,37 +549,4 @@ public class UrlValidator implements Serializable { return (options & flag) == 0; } - /** - * Validator for checking URL parsing - * @param args - URLs to validate - */ - public static void main(String[] args) { - UrlValidator uv = new UrlValidator(); - for(String arg: args) { - try { - URI uri = new URI(arg); - uri = uri.normalize(); - System.out.println(uri.toString()); - System.out.printf("URI scheme: %s%n", uri.getScheme()); - System.out.printf("URI scheme specific part: %s%n", uri.getSchemeSpecificPart()); - System.out.printf("URI raw scheme specific part: %s%n", uri.getRawSchemeSpecificPart()); - System.out.printf("URI auth: %s%n", uri.getAuthority()); - System.out.printf("URI raw auth: %s%n", uri.getRawAuthority()); - System.out.printf("URI userInfo: %s%n", uri.getUserInfo()); - System.out.printf("URI raw userInfo: %s%n", uri.getRawUserInfo()); - System.out.printf("URI host: %s%n", uri.getHost()); - System.out.printf("URI port: %s%n", uri.getPort()); - System.out.printf("URI path: %s%n", uri.getPath()); - System.out.printf("URI raw path: %s%n", uri.getRawPath()); - System.out.printf("URI query: %s%n", uri.getQuery()); - System.out.printf("URI raw query: %s%n", uri.getRawQuery()); - System.out.printf("URI fragment: %s%n", uri.getFragment()); - System.out.printf("URI raw fragment: %s%n", uri.getRawFragment()); - } catch (URISyntaxException e) { - System.out.println(e.getMessage()); - } - System.out.printf("isValid: %s%n",uv.isValid(arg)); - } - } - } diff --git a/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java index a436698..173b381 100644 --- a/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java +++ b/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java @@ -18,6 +18,8 @@ package org.apache.commons.validator.routines; import static org.junit.Assert.*; +import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; @@ -681,4 +683,37 @@ public class UrlValidatorTest { new ResultPair("telnet", false)}; + /** + * Validator for checking URL parsing + * @param args - URLs to validate + */ + public static void main(String[] args) { + UrlValidator uv = new UrlValidator(); + for(String arg: args) { + try { + URI uri = new URI(arg); + uri = uri.normalize(); + System.out.println(uri.toString()); + System.out.printf("URI scheme: %s%n", uri.getScheme()); + System.out.printf("URI scheme specific part: %s%n", uri.getSchemeSpecificPart()); + System.out.printf("URI raw scheme specific part: %s%n", uri.getRawSchemeSpecificPart()); + System.out.printf("URI auth: %s%n", uri.getAuthority()); + System.out.printf("URI raw auth: %s%n", uri.getRawAuthority()); + System.out.printf("URI userInfo: %s%n", uri.getUserInfo()); + System.out.printf("URI raw userInfo: %s%n", uri.getRawUserInfo()); + System.out.printf("URI host: %s%n", uri.getHost()); + System.out.printf("URI port: %s%n", uri.getPort()); + System.out.printf("URI path: %s%n", uri.getPath()); + System.out.printf("URI raw path: %s%n", uri.getRawPath()); + System.out.printf("URI query: %s%n", uri.getQuery()); + System.out.printf("URI raw query: %s%n", uri.getRawQuery()); + System.out.printf("URI fragment: %s%n", uri.getFragment()); + System.out.printf("URI raw fragment: %s%n", uri.getRawFragment()); + } catch (URISyntaxException e) { + System.out.println(e.getMessage()); + } + System.out.printf("isValid: %s%n",uv.isValid(arg)); + } + } + }