This is an automated email from the ASF dual-hosted git repository.
nacx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
The following commit(s) were added to refs/heads/master by this push:
new f6f3f99 Avoid using the guice injector int ests which triggers an NPE
f6f3f99 is described below
commit f6f3f99024317abc9b8e8ff58be86e6c923f43a8
Author: Jean-Noël Rouvignac <[email protected]>
AuthorDate: Mon Mar 1 11:49:24 2021 +0100
Avoid using the guice injector int ests which triggers an NPE
---
...yloadTest.java => BindACLToXMLPayloadTest.java} | 29 +++++++++-------------
.../binders/BindBucketLoggingToXmlPayloadTest.java | 8 ++----
apis/s3/src/test/resources/acl_to_xml.xml | 1 +
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git
a/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java
b/apis/s3/src/test/java/org/jclouds/s3/binders/BindACLToXMLPayloadTest.java
similarity index 68%
copy from
apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java
copy to
apis/s3/src/test/java/org/jclouds/s3/binders/BindACLToXMLPayloadTest.java
index d036b5f..f61e77b 100644
---
a/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/binders/BindACLToXMLPayloadTest.java
@@ -22,38 +22,33 @@ import java.io.IOException;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.functions.BaseHandlerTest;
+import org.jclouds.s3.domain.AccessControlList;
import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee;
-import org.jclouds.s3.domain.AccessControlList.Grant;
import org.jclouds.s3.domain.AccessControlList.Permission;
-import org.jclouds.s3.domain.BucketLogging;
+import org.jclouds.s3.domain.CanonicalUser;
import org.jclouds.util.Strings2;
import org.testng.annotations.Test;
-import com.google.common.collect.ImmutableSet;
-
/**
- * Tests behavior of {@code BindBucketLoggingToXmlPayload}
+ * Tests behavior of {@link #BindACLToXMLPayload}
*/
//NOTE:without testName, this will not call @Before* and fail w/NPE during
surefire
@Test(groups = "unit", testName = "BindBucketLoggingToXmlPayloadTest")
-public class BindBucketLoggingToXmlPayloadTest extends BaseHandlerTest {
-
- public void testApplyInputStream() throws IOException {
-
- BucketLogging bucketLogging = new BucketLogging("mylogs", "access_log-",
ImmutableSet
- .<Grant> of(new Grant(new
EmailAddressGrantee("[email protected]"),
- Permission.FULL_CONTROL)));
+public class BindACLToXMLPayloadTest extends BaseHandlerTest {
+ public void testBindToRequest() throws IOException {
+ AccessControlList acl = new AccessControlList();
+ acl.setOwner(new CanonicalUser("jnrouvignac", "Jean-Noël
Rouvignac"));
+ acl.addPermission(new EmailAddressGrantee("[email protected]"),
+ Permission.FULL_CONTROL);
String expected =
Strings2.toStringAndClose(getClass().getResourceAsStream(
- "/bucket_logging.xml"));
+ "/acl_to_xml.xml"));
HttpRequest request =
HttpRequest.builder().method("GET").endpoint("http://test";).build();
- BindBucketLoggingToXmlPayload binder = injector
- .getInstance(BindBucketLoggingToXmlPayload.class);
+ BindACLToXMLPayload binder = new BindACLToXMLPayload();
- binder.bindToRequest(request, bucketLogging);
+ binder.bindToRequest(request, acl);
assertEquals(request.getPayload().getContentMetadata().getContentType(),
"text/xml");
assertEquals(request.getPayload().getRawContent(), expected);
-
}
}
diff --git
a/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java
b/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java
index d036b5f..4e5ee9a 100644
---
a/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java
+++
b/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java
@@ -32,14 +32,12 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet;
/**
- * Tests behavior of {@code BindBucketLoggingToXmlPayload}
+ * Tests behavior of {@link #BindBucketLoggingToXmlPayload}
*/
//NOTE:without testName, this will not call @Before* and fail w/NPE during
surefire
@Test(groups = "unit", testName = "BindBucketLoggingToXmlPayloadTest")
public class BindBucketLoggingToXmlPayloadTest extends BaseHandlerTest {
-
public void testApplyInputStream() throws IOException {
-
BucketLogging bucketLogging = new BucketLogging("mylogs", "access_log-",
ImmutableSet
.<Grant> of(new Grant(new
EmailAddressGrantee("[email protected]"),
Permission.FULL_CONTROL)));
@@ -48,12 +46,10 @@ public class BindBucketLoggingToXmlPayloadTest extends
BaseHandlerTest {
"/bucket_logging.xml"));
HttpRequest request =
HttpRequest.builder().method("GET").endpoint("http://test";).build();
- BindBucketLoggingToXmlPayload binder = injector
- .getInstance(BindBucketLoggingToXmlPayload.class);
+ BindBucketLoggingToXmlPayload binder = new
BindBucketLoggingToXmlPayload();
binder.bindToRequest(request, bucketLogging);
assertEquals(request.getPayload().getContentMetadata().getContentType(),
"text/xml");
assertEquals(request.getPayload().getRawContent(), expected);
-
}
}
diff --git a/apis/s3/src/test/resources/acl_to_xml.xml
b/apis/s3/src/test/resources/acl_to_xml.xml
new file mode 100644
index 0000000..94a66fb
--- /dev/null
+++ b/apis/s3/src/test/resources/acl_to_xml.xml
@@ -0,0 +1 @@
+<AccessControlPolicy
xmlns="http://s3.amazonaws.com/doc/2006-03-01/";><Owner><ID>jnrouvignac</ID><DisplayName>Jean-Noël
Rouvignac</DisplayName></Owner><AccessControlList><Grant><Grantee
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:type="AmazonCustomerByEmail"><EmailAddress>[email protected]</EmailAddress></Grantee><Permission>FULL_CONTROL</Permission></Grant></AccessControlList></AccessControlPolicy>
\ No newline at end of file
