Author: magicaltrout
Date: Thu Jan 1 21:28:03 2015
New Revision: 1648946
URL: http://svn.apache.org/r1648946
Log:
Fix some of the broken tests
Modified:
oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/TestHttpProtocol.java
oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
Modified:
oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/TestHttpProtocol.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/TestHttpProtocol.java?rev=1648946&r1=1648945&r2=1648946&view=diff
==============================================================================
---
oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/TestHttpProtocol.java
(original)
+++
oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/TestHttpProtocol.java
Thu Jan 1 21:28:03 2015
@@ -65,7 +65,8 @@ public class TestHttpProtocol extends Te
HttpProtocol httpProtocol = new HttpProtocol();
httpProtocol.connect("svn.apache.org", new NoAuthentication());
assertTrue(httpProtocol.connected());
- ProtocolFile gotoDir = new ProtocolFile(httpProtocol.pwd(),
"repos/asf/oodt/trunk/protocol/http/src/test/org/apache/oodt/cas/protocol/http",
true);
+ ProtocolFile gotoDir = new ProtocolFile(httpProtocol.pwd(),
+
"repos/asf/oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http",
true);
httpProtocol.cd(gotoDir);
ProtocolFile currentDir = httpProtocol.pwd();
System.out.println(gotoDir.getAbsoluteFile());
@@ -77,7 +78,8 @@ public class TestHttpProtocol extends Te
HttpProtocol httpProtocol = new HttpProtocol();
httpProtocol.connect("svn.apache.org", new NoAuthentication());
assertTrue(httpProtocol.connected());
- httpProtocol.cd(new
ProtocolFile("repos/asf/oodt/trunk/protocol/http/src/test/org/apache/oodt/cas/protocol/http",
true));
+ httpProtocol.cd(new
ProtocolFile("repos/asf/oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas"
+
+ "/protocol/http", true));
File bogus = File.createTempFile("bogus", "bogus");
File tmpDir = new File(bogus.getParentFile(),
"TestHttpProtocol");
bogus.delete();
@@ -92,7 +94,10 @@ public class TestHttpProtocol extends Te
while(scanner.hasNextLine()) {
fileContent += scanner.nextLine();
}
- assertEquals(fileContent,
HttpUtils.readUrl(HttpUtils.connect(new
URL("http://svn.apache.org/repos/asf/oodt/trunk/protocol/http/src/test/org/apache/oodt/cas/protocol/http/TestHttpProtocol.java";))));
+ assertEquals(fileContent,
HttpUtils.readUrl(HttpUtils.connect(new
URL("http://svn.apache.org/repos/asf/oodt/";
+
+
"trunk/protocol/http/src/test/java/org/"
+
+
"apache/oodt/cas/protocol/http/"
+
+
"TestHttpProtocol.java"))));
FileUtils.forceDelete(tmpDir);
}
}
Modified:
oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java?rev=1648946&r1=1648945&r2=1648946&view=diff
==============================================================================
---
oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
(original)
+++
oodt/trunk/protocol/http/src/test/java/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
Thu Jan 1 21:28:03 2015
@@ -42,7 +42,8 @@ public class TestHttpUtils extends TestC
private static final String APACHE_SVN_SITE = "http://svn.apache.org";;
private static final String PROTOCOL_HTTP_SVN_LOC =
"/repos/asf/oodt/trunk/protocol/http";
- private static final String PARENT_URL_OF_THIS_TEST =
PROTOCOL_HTTP_SVN_LOC + "/src/test/org/apache/oodt/cas/protocol/http/util";
+ private static final String PARENT_URL_OF_THIS_TEST =
PROTOCOL_HTTP_SVN_LOC +
+
"/src/test/java/org/apache/oodt/cas/protocol/http/util";
private static final String URL_OF_THIS_TEST = PARENT_URL_OF_THIS_TEST
+ "/TestHttpUtils.java";
public void testResolveUri() throws URISyntaxException {
