You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/25 19:29:49 UTC
[2/6] git commit: Revert "Remove Java 6 litter"
Revert "Remove Java 6 litter"
This reverts commit a10bf3e9c5495b4c8c69e0059b5901266df471dd.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0785d808
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0785d808
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0785d808
Branch: refs/heads/master
Commit: 0785d8082709103d634665d312780e5a7d5b6abe
Parents: 0a801d2
Author: Adrian Cole <ad...@gmail.com>
Authored: Fri Oct 24 19:37:52 2014 -0700
Committer: Adrian Cole <ad...@gmail.com>
Committed: Sat Oct 25 10:28:46 2014 -0700
----------------------------------------------------------------------
.../jclouds/http/functions/ParseSaxTest.java | 25 +++++++-------------
.../test/java/org/jclouds/utils/TestUtils.java | 6 +++--
2 files changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0785d808/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java b/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java
index d794814..b16002b 100644
--- a/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java
+++ b/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java
@@ -22,12 +22,9 @@ import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.testng.Assert.assertEquals;
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse;
+import org.jclouds.utils.TestUtils;
import org.testng.annotations.Test;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -50,8 +47,7 @@ public class ParseSaxTest extends BaseHandlerTest {
}
@Test
- public void testAddDetailsAndPropagateOkWhenRequestWithNoDataAndRuntimeExceptionThrowsOriginalException()
- throws ExecutionException, InterruptedException, TimeoutException, IOException {
+ public void testAddDetailsAndPropagateOkWhenRequestWithNoDataAndRuntimeExceptionThrowsOriginalException() {
ParseSax<String> parser = createParser();
Exception input = new RuntimeException("foo");
@@ -64,8 +60,7 @@ public class ParseSaxTest extends BaseHandlerTest {
}
@Test
- public void testAddDetailsAndPropagateOkWhenRequestWithNoDataAndExceptionPropagates() throws ExecutionException,
- InterruptedException, TimeoutException, IOException {
+ public void testAddDetailsAndPropagateOkWhenRequestWithNoDataAndExceptionPropagates() {
ParseSax<String> parser = createParser();
Exception input = new Exception("foo");
@@ -79,8 +74,7 @@ public class ParseSaxTest extends BaseHandlerTest {
}
@Test
- public void testAddDetailsAndPropagateOkWhenRequestIsNotNullAndResponseIsNull() throws ExecutionException,
- InterruptedException, TimeoutException, IOException {
+ public void testAddDetailsAndPropagateOkWhenRequestIsNotNullAndResponseIsNull() {
ParseSax<String> parser = createParser();
HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://foohost").build();
@@ -96,8 +90,7 @@ public class ParseSaxTest extends BaseHandlerTest {
}
@Test
- public void testAddDetailsAndPropagateOkWithValidRequestResponse() throws ExecutionException, InterruptedException,
- TimeoutException, IOException {
+ public void testAddDetailsAndPropagateOkWithValidRequestResponse() {
ParseSax<String> parser = createParser();
HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://foohost").build();
@@ -114,8 +107,7 @@ public class ParseSaxTest extends BaseHandlerTest {
}
@Test
- public void testAddDetailsAndPropagateOkWithValidRequestResponseWithSAXParseException() throws ExecutionException,
- InterruptedException, TimeoutException, IOException {
+ public void testAddDetailsAndPropagateOkWithValidRequestResponseWithSAXParseException() {
ParseSax<String> parser = createParser();
HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://foohost").build();
@@ -133,8 +125,9 @@ public class ParseSaxTest extends BaseHandlerTest {
parser.setContext(request);
parser.addDetailsAndPropagate(response, input);
} catch (RuntimeException e) {
- assertEquals(e.getMessage(),
- "request: GET http://foohost HTTP/1.1; response: HTTP/1.1 304 Not Modified; error at 1:1 in document systemId; cause: org.xml.sax.SAXParseExceptionpublicId: publicId; systemId: systemId; lineNumber: 1; columnNumber: 1; foo");
+ assertEquals(e.getMessage(), TestUtils.isJava6()
+ ? "request: GET http://foohost HTTP/1.1; response: HTTP/1.1 304 Not Modified; error at 1:1 in document systemId; cause: org.xml.sax.SAXParseException: foo"
+ : "request: GET http://foohost HTTP/1.1; response: HTTP/1.1 304 Not Modified; error at 1:1 in document systemId; cause: org.xml.sax.SAXParseExceptionpublicId: publicId; systemId: systemId; lineNumber: 1; columnNumber: 1; foo");
assertEquals(e.getCause(), input);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0785d808/core/src/test/java/org/jclouds/utils/TestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/utils/TestUtils.java b/core/src/test/java/org/jclouds/utils/TestUtils.java
index e276103..c2fde4f 100644
--- a/core/src/test/java/org/jclouds/utils/TestUtils.java
+++ b/core/src/test/java/org/jclouds/utils/TestUtils.java
@@ -26,14 +26,16 @@ import com.google.common.io.ByteSource;
* Utility class for test
*/
public class TestUtils {
- public static final Object[][] NO_INVOCATIONS = new Object[0][0];
- public static final Object[][] SINGLE_NO_ARG_INVOCATION = { new Object[0] };
public static boolean isMacOSX() {
String osName = System.getProperty("os.name");
return osName.contains("OS X");
}
+ public static boolean isJava6() {
+ return System.getProperty("java.version", "").contains("1.6.");
+ }
+
public static ByteSource randomByteSource() {
return randomByteSource(0);
}