harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r386319 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net: AllTests.java URITest.java
Date Thu, 16 Mar 2006 12:40:39 GMT
Author: tellison
Date: Thu Mar 16 04:40:36 2006
New Revision: 386319

URL: http://svn.apache.org/viewcvs?rev=386319&view=rev
Log:
Fix for HARMONY-202 (Non-ascii source file URITest breaking eclipse compiler test build)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/AllTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URITest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/AllTests.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/AllTests.java?rev=386319&r1=386318&r2=386319&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/AllTests.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/AllTests.java
Thu Mar 16 04:40:36 2006
@@ -53,8 +53,7 @@
 		suite.addTestSuite(SocketPermissionTest.class);
 		suite.addTestSuite(UnknownHostExceptionTest.class);
 		suite.addTestSuite(UnknownServiceExceptionTest.class);
-		// TOFIX: remove non-ascii from the source for this test
-                // suite.addTestSuite(URITest.class);
+                suite.addTestSuite(URITest.class);
 		suite.addTestSuite(URISyntaxExceptionTest.class);
 		suite.addTestSuite(URLTest.class);
 		suite.addTestSuite(URLClassLoaderTest.class);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URITest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URITest.java?rev=386319&r1=386318&r2=386319&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URITest.java
Thu Mar 16 04:40:36 2006
@@ -40,7 +40,7 @@
 						new URI(
 								"ascheme://user\u00DF\u00A3info@host:0/a\u20ACpath?qu\u00A9\u00AEery#fr\u00E4\u00E8g"),
 						// unicode chars equivalent to = new
-						// URI("ascheme://userߣinfo@host:0/a€path?qu©®ery#fräèg"),
+						// URI("ascheme://user\u00df\u00a3info@host:0/a\u0080path?qu\u00a9\u00aeery#fr\u00e4\u00e8g"),
 
 						// multiple arg constructors
 						new URI("http", "user%60%20info", "host", 80,
@@ -54,7 +54,7 @@
 								"/a\u20ACpath", "qu\u00A9\u00AEery",
 								"fr\u00E4\u00E8g"),
 						// unicode chars equivalent to = new
-						// URI("ascheme", "userߣinfo", "host", 80, "/a€path", "qu©®ery", "fräèg"),
+						// URI("ascheme", "user\u00df\u00a3info", "host", 80, "/a\u0080path", "qu\u00a9\u00aeery",
"fr\u00e4\u00e8g"),
 						new URI("http", "user` info", "host", 81, "/a path",
 								"qu` ery", "fr^ ag"), // illegal chars
 						new URI("http", "user%info", "host", 0, "/a%path",
@@ -118,12 +118,12 @@
 				// path with escaped octet for unicode char, not USASCII
 				"http://host/a\u20ACpath#frag",
 				// path with unicode char, not USASCII equivalent to
-				// = "http://host/a€path#frag",
+				// = "http://host/a\u0080path#frag",
 				"http://host%20name/", // escaped octets in host (becomes
 				// registry based)
 				"http://host\u00DFname/", // unicodechar in host (becomes
 				// registry based)
-				// equivalent to = "http://hostßname/",
+				// equivalent to = "http://host\u00dfname/",
 				"ht123-+tp://www.google.com:80/test", // legal chars in scheme
 		};
 
@@ -201,7 +201,7 @@
 				// scheme validation
 				"a scheme://reg/", // illegal char
 				"1scheme://reg/", // non alpha char as 1st char
-				"ascheßme:ssp", // unicode char , not USASCII
+				"asche\u00dfme:ssp", // unicode char , not USASCII
 				"asc%20heme:ssp" // escape octets
 		};
 
@@ -301,7 +301,7 @@
 		// check for URISyntaxException for invalid Server Authority
 		construct1("http", "user", "host\u00DFname", -1, "/file", "query",
 				"fragment"); // unicode chars in host name
-		// equivalent to construct1("http", "user", "hostßname", -1, "/file",
+		// equivalent to construct1("http", "user", "host\u00dfname", -1, "/file",
 		// "query", "fragment");
 		construct1("http", "user", "host%20name", -1, "/file", "query",
 				"fragment"); // escaped octets in host name
@@ -331,7 +331,7 @@
 		// check for URISyntaxException for invalid scheme
 		construct1("ht\u00DFtp", "user", "hostname", -1, "/file", "query",
 				"fragment"); // unicode chars in scheme
-		// equivalent to construct1("htßtp", "user", "hostname", -1, "/file",
+		// equivalent to construct1("ht\u00dftp", "user", "hostname", -1, "/file",
 		// "query", "fragment");
 		
 		construct1("ht%20tp", "user", "hostname", -1, "/file", "query",
@@ -410,7 +410,7 @@
 			uri = new URI("http", "host", "/a%E2%82%ACpath", "frag");
 
 			// frag with unicode char, not USASCII
-			// equivalent to = uri = new URI("http", "host", "/apath", "€frag");
+			// equivalent to = uri = new URI("http", "host", "/apath", "\u0080frag");
 			uri = new URI("http", "host", "/apath", "\u20ACfrag"); 
 
 		} catch (URISyntaxException e) {
@@ -442,7 +442,7 @@
 			uri = new URI("ht12-3+tp", "", "/p#a%E2%82%ACth", "q^u%25ery",
 					"f/r\u00DFag");
 			// equivalent to = uri = new URI("ht12-3+tp", "", "/p#a%E2%82%ACth",
-			// "q^u%25ery", "f/rßag");
+			// "q^u%25ery", "f/r\u00dfag");
 		} catch (URISyntaxException e) {
 			fail("Unexpected URISyntaxException: " + e);
 		}
@@ -456,14 +456,14 @@
 		assertTrue("wrong query", uri.getQuery().equals("q^u%25ery"));
 		assertTrue("wrong fragment", uri.getFragment().equals("f/r\u00DFag"));
 		// equivalent to = assertTrue("wrong fragment",
-		// uri.getFragment().equals("f/rßag"));
+		// uri.getFragment().equals("f/r\u00dfag"));
 		assertTrue("wrong SchemeSpecificPart", uri.getSchemeSpecificPart()
 				.equals("///p#a%E2%82%ACth?q^u%25ery"));
 		assertTrue("wrong RawSchemeSpecificPart", uri
 				.getRawSchemeSpecificPart().equals(
 						"///p%23a%25E2%2582%25ACth?q%5Eu%2525ery"));
 		assertTrue("incorrect toString()", uri.toString().equals(
-				"ht12-3+tp:///p%23a%25E2%2582%25ACth?q%5Eu%2525ery#f/rßag"));
+				"ht12-3+tp:///p%23a%25E2%2582%25ACth?q%5Eu%2525ery#f/r\u00dfag"));
 		assertTrue(
 				"incorrect toASCIIString()",
 				uri
@@ -740,11 +740,11 @@
 
 		String[] getAuthorityResults = {
 				"user` info@host",
-				"user\u00DF\u00A3info@host:80", // = "userߣinfo@host:80",
-				"user\u00DF\u00A3info@host:0", // = "userߣinfo@host:0",
+				"user\u00DF\u00A3info@host:80", // = "user\u00df\u00a3info@host:80",
+				"user\u00DF\u00A3info@host:0", // = "user\u00df\u00a3info@host:0",
 				"user%60%20info@host:80",
 				"user%C3%9F%C2%A3info@host",
-				"user\u00DF\u00A3info@host:80", // = "userߣinfo@host:80",
+				"user\u00DF\u00A3info@host:80", // = "user\u00df\u00a3info@host:80",
 				"user` info@host:81", "user%info@host:0", null, null, null,
 				null, "server.org", "reg:istry", null, };
 
@@ -818,10 +818,10 @@
 		URI[] uris = getUris();
 
 		String[] getFragmentResults = { "fr^ ag", "fr\u00E4\u00E8g", // =
-				// "fräèg",
-				"fr\u00E4\u00E8g", // = "fräèg",
+				// "fr\u00e4\u00e8g",
+				"fr\u00E4\u00E8g", // = "fr\u00e4\u00e8g",
 				"fr%5E%20ag", "fr%C3%A4%C3%A8g", "fr\u00E4\u00E8g", // =
-				// "fräèg",
+				// "fr\u00e4\u00e8g",
 				"fr^ ag", "f%rag", null, "", null, "fragment", null, null, null };
 
 		for (int i = 0; i < uris.length; i++) {
@@ -870,10 +870,10 @@
 		URI[] uris = getUris();
 
 		String[] getPathResults = { "/a path",
-				"/a\u20ACpath", // = "/a€path",
-				"/a\u20ACpath", // = "/a€path",
+				"/a\u20ACpath", // = "/a\u0080path",
+				"/a\u20ACpath", // = "/a\u0080path",
 				"/a%20path", "/a%E2%82%ACpath",
-				"/a\u20ACpath", // = "/a€path",
+				"/a\u20ACpath", // = "/a\u0080path",
 				"/a path", "/a%path", null, "../adirectory/file.html", null,
 				"", "", "", "/c:/temp/calculate.pl" };
 
@@ -951,10 +951,10 @@
 		URI[] uris = getUris();
 
 		String[] getQueryResults = { "qu` ery", "qu\u00A9\u00AEery", // =
-				// "qu©®ery",
-				"qu\u00A9\u00AEery", // = "qu©®ery",
+				// "qu\u00a9\u00aeery",
+				"qu\u00A9\u00AEery", // = "qu\u00a9\u00aeery",
 				"qu%60%20ery", "qu%C2%A9%C2%AEery", "qu\u00A9\u00AEery", // =
-				// "qu©®ery",
+				// "qu\u00a9\u00aeery",
 				"qu` ery", "que%ry", null, null, null, null, null, "query", "" };
 
 		for (int i = 0; i < uris.length; i++) {
@@ -981,10 +981,10 @@
 				"user%60%20info@host",
 				"user%C3%9F%C2%A3info@host:80",
 				"user\u00DF\u00A3info@host:0", // =
-				// "userߣinfo@host:0",
+				// "user\u00df\u00a3info@host:0",
 				"user%2560%2520info@host:80",
 				"user%25C3%259F%25C2%25A3info@host",
-				"user\u00DF\u00A3info@host:80", // = "userߣinfo@host:80",
+				"user\u00DF\u00A3info@host:80", // = "user\u00df\u00a3info@host:80",
 				"user%60%20info@host:81", "user%25info@host:0", null, null,
 				null, null, "server.org", "reg:istry", null };
 
@@ -1010,10 +1010,10 @@
 
 		String[] getRawFragmentResults = { "fr%5E%20ag",
 				"fr%C3%A4%C3%A8g",
-				"fr\u00E4\u00E8g", // = "fräèg",
+				"fr\u00E4\u00E8g", // = "fr\u00e4\u00e8g",
 				"fr%255E%2520ag", "fr%25C3%25A4%25C3%25A8g",
 				"fr\u00E4\u00E8g", // =
-				// "fräèg",
+				// "fr\u00e4\u00e8g",
 				"fr%5E%20ag", "f%25rag", null, "", null, "fragment", null,
 				null, null };
 
@@ -1039,10 +1039,10 @@
 
 		String[] getRawPathResults = { "/a%20path",
 				"/a%E2%82%ACpath",
-				"/a\u20ACpath", // = "/a€path",
+				"/a\u20ACpath", // = "/a\u0080path",
 				"/a%2520path", "/a%25E2%2582%25ACpath",
 				"/a\u20ACpath", // =
-				// "/a€path",
+				// "/a\u0080path",
 				"/a%20path", "/a%25path", null, "../adirectory/file.html",
 				null, "", "", "", "/c:/temp/calculate.pl" };
 
@@ -1069,10 +1069,10 @@
 		String[] getRawQueryResults = {
 				"qu%60%20ery",
 				"qu%C2%A9%C2%AEery",
-				"qu\u00A9\u00AEery", // = "qu©®ery",
+				"qu\u00A9\u00AEery", // = "qu\u00a9\u00aeery",
 				"qu%2560%2520ery",
 				"qu%25C2%25A9%25C2%25AEery",
-				"qu\u00A9\u00AEery", // = "qu©®ery",
+				"qu\u00A9\u00AEery", // = "qu\u00a9\u00aeery",
 				"qu%60%20ery", "que%25ry", null, null, null, null, null,
 				"query", "" };
 
@@ -1101,11 +1101,11 @@
 				"//user%60%20info@host/a%20path?qu%60%20ery",
 				"//user%C3%9F%C2%A3info@host:80/a%E2%82%ACpath?qu%C2%A9%C2%AEery",
 				"//user\u00DF\u00A3info@host:0/a\u20ACpath?qu\u00A9\u00AEery", // =
-				// "//userߣinfo@host:0/a€path?qu©®ery"
+				// "//user\u00df\u00a3info@host:0/a\u0080path?qu\u00a9\u00aeery"
 				"//user%2560%2520info@host:80/a%2520path?qu%2560%2520ery",
 				"//user%25C3%259F%25C2%25A3info@host/a%25E2%2582%25ACpath?qu%25C2%25A9%25C2%25AEery",
 				"//user\u00DF\u00A3info@host:80/a\u20ACpath?qu\u00A9\u00AEery", // =
-				// "//userߣinfo@host:80/a€path?qu©®ery"
+				// "//user\u00df\u00a3info@host:80/a\u0080path?qu\u00a9\u00aeery"
 				"//user%60%20info@host:81/a%20path?qu%60%20ery",
 				"//user%25info@host:0/a%25path?que%25ry", "user@domain.com",
 				"../adirectory/file.html", "comp.infosystems.www.servers.unix",
@@ -1134,10 +1134,10 @@
 		String[] getRawUserInfoResults = {
 				"user%60%20info",
 				"user%C3%9F%C2%A3info",
-				"user\u00DF\u00A3info", // = "userߣinfo",
+				"user\u00DF\u00A3info", // = "user\u00df\u00a3info",
 				"user%2560%2520info",
 				"user%25C3%259F%25C2%25A3info",
-				"user\u00DF\u00A3info", // = "userߣinfo",
+				"user\u00DF\u00A3info", // = "user\u00df\u00a3info",
 				"user%60%20info", "user%25info", null, null, null, null, null,
 				null, null };
 
@@ -1188,13 +1188,13 @@
 		String[] getSspResults = {
 				"//user` info@host/a path?qu` ery",
 				"//user\u00DF\u00A3info@host:80/a\u20ACpath?qu\u00A9\u00AEery", // =
-				// "//userߣinfo@host:80/a€path?qu©®ery",
+				// "//user\u00df\u00a3info@host:80/a\u0080path?qu\u00a9\u00aeery",
 				"//user\u00DF\u00A3info@host:0/a\u20ACpath?qu\u00A9\u00AEery", // =
-				// "//userߣinfo@host:0/a€path?qu©®ery",
+				// "//user\u00df\u00a3info@host:0/a\u0080path?qu\u00a9\u00aeery",
 				"//user%60%20info@host:80/a%20path?qu%60%20ery",
 				"//user%C3%9F%C2%A3info@host/a%E2%82%ACpath?qu%C2%A9%C2%AEery",
 				"//user\u00DF\u00A3info@host:80/a\u20ACpath?qu\u00A9\u00AEery", // =
-				// "//userߣinfo@host:80/a€path?qu©®ery",
+				// "//user\u00df\u00a3info@host:80/a\u0080path?qu\u00a9\u00aeery",
 				"//user` info@host:81/a path?qu` ery",
 				"//user%info@host:0/a%path?que%ry", "user@domain.com",
 				"../adirectory/file.html", "comp.infosystems.www.servers.unix",
@@ -1224,11 +1224,11 @@
 		String[] getUserInfoResults = {
 				"user` info",
 				"user\u00DF\u00A3info", // =
-				// "userߣinfo",
-				"user\u00DF\u00A3info", // = "userߣinfo",
+				// "user\u00df\u00a3info",
+				"user\u00DF\u00A3info", // = "user\u00df\u00a3info",
 				"user%60%20info",
 				"user%C3%9F%C2%A3info",
-				"user\u00DF\u00A3info", // = "userߣinfo",
+				"user\u00DF\u00A3info", // = "user\u00df\u00a3info",
 				"user` info", "user%info", null, null, null, null, null, null,
 				null };
 
@@ -1491,11 +1491,11 @@
 					new URI("http://foo:bar/file#fragment"),
 					new URI("http", "//foo:bar/file", "fragment"),
 					
-					// unicode char in the hostname = new URI("http://hostßname/")
+					// unicode char in the hostname = new URI("http://host\u00dfname/")
 					new URI("http://host\u00DFname/"),
 					
 					new URI("http", "//host\u00DFname/", null), 
-					// = new URI("http://hostßname/", null),
+					// = new URI("http://host\u00dfname/", null),
 					
 					// escaped octets in host name
 					new URI("http://host%20name/"),
@@ -1833,11 +1833,11 @@
 				"http://user%60%20info@host/a%20path?qu%60%20ery#fr%5E%20ag",
 				"http://user%C3%9F%C2%A3info@host:80/a%E2%82%ACpath?qu%C2%A9%C2%AEery#fr%C3%A4%C3%A8g",
 				"ascheme://user\u00DF\u00A3info@host:0/a\u20ACpath?qu\u00A9\u00AEery#fr\u00E4\u00E8g",
-				// = "ascheme://userߣinfo@host:0/a€path?qu©®ery#fräèg",
+				// = "ascheme://user\u00df\u00a3info@host:0/a\u0080path?qu\u00a9\u00aeery#fr\u00e4\u00e8g",
 				"http://user%2560%2520info@host:80/a%2520path?qu%2560%2520ery#fr%255E%2520ag",
 				"http://user%25C3%259F%25C2%25A3info@host/a%25E2%2582%25ACpath?qu%25C2%25A9%25C2%25AEery#fr%25C3%25A4%25C3%25A8g",
 				"ascheme://user\u00DF\u00A3info@host:80/a\u20ACpath?qu\u00A9\u00AEery#fr\u00E4\u00E8g",
-				// = "ascheme://userߣinfo@host:80/a€path?qu©®ery#fräèg",
+				// = "ascheme://user\u00df\u00a3info@host:80/a\u0080path?qu\u00a9\u00aeery#fr\u00e4\u00e8g",
 				"http://user%60%20info@host:81/a%20path?qu%60%20ery#fr%5E%20ag",
 				"http://user%25info@host:0/a%25path?que%25ry#f%25rag",
 				"mailto:user@domain.com", "../adirectory/file.html#",



Mime
View raw message