jericho 2003/01/04 23:57:15
Modified: src/tests/uri KoreanURITest.java HttpURLTest.java
HttpsURLTest.java BasicURITest.java
Log:
- Reflect the getURIReference method to the test cases
Revision Changes Path
1.2 +17 -17 jakarta-slide/src/tests/uri/KoreanURITest.java
Index: KoreanURITest.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/tests/uri/KoreanURITest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KoreanURITest.java 17 Aug 2002 23:31:04 -0000 1.1
+++ KoreanURITest.java 5 Jan 2003 07:57:15 -0000 1.2
@@ -219,8 +219,8 @@
String uriReference = "http://HanGul/���?����#����";;
String escapedUriReference = "http://HanGul/%EA%B2%BD%EB%A1%9C?%EC%A7"; +
"%88%EC%9D%98#%EC%B0%B8%EC%A1%B0";
- assertEquals(uriReference, uri.getURI());
- assertEquals(escapedUriReference, uri.getEscapedURI());
+ assertEquals(uriReference, uri.getURIReference());
+ assertEquals(escapedUriReference, uri.getEscapedURIReference());
}
@@ -266,8 +266,8 @@
String uriReference = "http://HanGul/���?����";;
String escapedUriReference = "http://HanGul/%EA%B2%BD%EB%A1%9C?%EC%A7"; +
"%88%EC%9D%98";
- assertEquals(uriReference, uri.getURI());
- assertEquals(escapedUriReference, uri.getEscapedURI());
+ assertEquals(uriReference, uri.getURIReference());
+ assertEquals(escapedUriReference, uri.getEscapedURIReference());
}
@@ -312,8 +312,8 @@
String uriReference = "http://HanGul/���";;
String escapedUriReference = "http://HanGul/%EA%B2%BD%EB%A1%9C";;
- assertEquals(uriReference, uri.getURI());
- assertEquals(escapedUriReference, uri.getEscapedURI());
+ assertEquals(uriReference, uri.getURIReference());
+ assertEquals(escapedUriReference, uri.getEscapedURIReference());
}
@@ -359,8 +359,8 @@
String uriReference = "https://Corean:81/���ѹα�/�ѱ�/";;
String escapedUriReference = "https://Corean:81/%EB%8C%80%ED%95%9C"; +
"%EB%AF%BC%EA%B5%AD/%ED%95%9C%EA%B8%80/";
- assertEquals(uriReference, uri.getURI());
- assertEquals(escapedUriReference, uri.getEscapedURI());
+ assertEquals(uriReference, uri.getURIReference());
+ assertEquals(escapedUriReference, uri.getEscapedURIReference());
}
@@ -409,8 +409,8 @@
String escapedUriReference = "https://Korean:82/%EC%9E%90%EC%B9%B4"; +
"%EB%A5%B4%ED%83%80/%EC%8A%AC%EB%9D%BC%EC%9D%B4%EB%93%9C_%ED%94" +
"%84%EB%A1%9C%EC%A0%9D%ED%8A%B8";
- assertEquals(uriReference, uri.getURI());
- assertEquals(escapedUriReference, uri.getEscapedURI());
+ assertEquals(uriReference, uri.getURIReference());
+ assertEquals(escapedUriReference, uri.getEscapedURIReference());
}
@@ -456,8 +456,8 @@
String uriReference = "http://HanJa/����?����#߳��";;
String escapedUriReference = "http://HanJa/%E7%B6%93%E8%B7%AF?%E8%B3"; +
"%AA%E7%96%91#%EF%A5%AB%E7%85%A7";
- assertEquals(uriReference, uri.getURI());
- assertEquals(escapedUriReference, uri.getEscapedURI());
+ assertEquals(uriReference, uri.getURIReference());
+ assertEquals(escapedUriReference, uri.getEscapedURIReference());
}
@@ -503,8 +503,8 @@
String uriReference = "http://HanJa/����?����";;
String escapedUriReference = "http://HanJa/%E7%B6%93%E8%B7%AF?%E8%B3"; +
"%AA%E7%96%91";
- assertEquals(uriReference, uri.getURI());
- assertEquals(escapedUriReference, uri.getEscapedURI());
+ assertEquals(uriReference, uri.getURIReference());
+ assertEquals(escapedUriReference, uri.getEscapedURIReference());
}
@@ -549,8 +549,8 @@
String uriReference = "http://HanJa/����";;
String escapedUriReference = "http://HanJa/%E7%B6%93%E8%B7%AF";;
- assertEquals(uriReference, uri.getURI());
- assertEquals(escapedUriReference, uri.getEscapedURI());
+ assertEquals(uriReference, uri.getURIReference());
+ assertEquals(escapedUriReference, uri.getEscapedURIReference());
}
}
1.2 +6 -6 jakarta-slide/src/tests/uri/HttpURLTest.java
Index: HttpURLTest.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/tests/uri/HttpURLTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpURLTest.java 4 Sep 2002 00:21:42 -0000 1.1
+++ HttpURLTest.java 5 Jan 2003 07:57:15 -0000 1.2
@@ -112,7 +112,7 @@
public void testExample01() throws URIException {
String result = "http://host/path?query#fragment";;
HttpURL http = new HttpURL(result);
- assertEquals(result, http.getURI());
+ assertEquals(result, http.getURIReference());
}
@@ -312,10 +312,10 @@
HttpURL http = new HttpURL("user:password", "host", 8080, "/path",
"query", "fragment");
String result = "http://host:8080/path?query#fragment";;
- assertEquals(result, http.getURI());
+ assertEquals(result, http.getURIReference());
result = "/path?query#fragment";
http = new HttpURL(null, null, -1, "/path", "query", "fragment");
- assertEquals(result, http.getURI());
+ assertEquals(result, http.getURIReference());
}
@@ -331,7 +331,7 @@
result = "password";
assertEquals(result, http.getPassword());
result = "http://host/path?query#fragment";;
- assertEquals(result, http.getURI());
+ assertEquals(result, http.getURIReference());
result = "/path?query#fragment";
http = new HttpURL(null, null, "/path", "query", "fragment");
@@ -340,7 +340,7 @@
result = null;
assertEquals(result, http.getUser());
result = "/path?query#fragment";
- assertEquals(result, http.getURI());
+ assertEquals(result, http.getURIReference());
}
1.2 +6 -6 jakarta-slide/src/tests/uri/HttpsURLTest.java
Index: HttpsURLTest.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/tests/uri/HttpsURLTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpsURLTest.java 10 Sep 2002 22:42:39 -0000 1.1
+++ HttpsURLTest.java 5 Jan 2003 07:57:15 -0000 1.2
@@ -113,7 +113,7 @@
public void testExample01() throws URIException {
String result = "https://host/path?query#fragment";;
HttpsURL https = new HttpsURL(result);
- assertEquals(result, https.getURI());
+ assertEquals(result, https.getURIReference());
}
@@ -313,10 +313,10 @@
HttpsURL https = new HttpsURL("user:password", "host", 8080, "/path",
"query", "fragment");
String result = "https://host:8080/path?query#fragment";;
- assertEquals(result, https.getURI());
+ assertEquals(result, https.getURIReference());
result = "/path?query#fragment";
https = new HttpsURL(null, null, -1, "/path", "query", "fragment");
- assertEquals(result, https.getURI());
+ assertEquals(result, https.getURIReference());
}
@@ -332,7 +332,7 @@
result = "password";
assertEquals(result, https.getPassword());
result = "https://host/path?query#fragment";;
- assertEquals(result, https.getURI());
+ assertEquals(result, https.getURIReference());
result = "/path?query#fragment";
https = new HttpsURL(null, null, "/path", "query", "fragment");
@@ -341,7 +341,7 @@
result = null;
assertEquals(result, https.getUser());
result = "/path?query#fragment";
- assertEquals(result, https.getURI());
+ assertEquals(result, https.getURIReference());
}
1.2 +4 -4 jakarta-slide/src/tests/uri/BasicURITest.java
Index: BasicURITest.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/tests/uri/BasicURITest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicURITest.java 17 Aug 2002 15:12:07 -0000 1.1
+++ BasicURITest.java 5 Jan 2003 07:57:15 -0000 1.2
@@ -216,9 +216,9 @@
char[] rawUriReference = { 'h', 't', 't', 'p', ':', '/', '/', 'h', 'o',
's', 't', '/', 'p', 'a', 't', 'h', '?', 'q', 'u',
'e', 'r', 'y', '#', 'f', 'r', 'a', 'g', 'm', 'e', 'n', 't' };
- assertEquals(uriReference, uri.getURI());
- assertEquals(escapedUriReference, uri.getEscapedURI());
- assertEquals(rawUriReference, uri.getRawURI());
+ assertEquals(uriReference, uri.getURIReference());
+ assertEquals(escapedUriReference, uri.getEscapedURIReference());
+ assertEquals(rawUriReference, uri.getRawURIReference());
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
