Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-06 10:09:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove Java 6 litter"

Browse Source 
This reverts commit a10bf3e9c5495b4c8c69e0059b5901266df471dd.
This commit is contained in:
Adrian Cole 2014-10-24 19:37:52 -07:00
parent 0a801d2ad2
commit 0785d80827
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java
View File

@ -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);
}
}

6
core/src/test/java/org/jclouds/utils/TestUtils.java
View File

@ -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);
}