Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid using the guice injector int ests which triggers an NPE

This commit is contained in:
Jean-Noël Rouvignac 2021-03-01 11:49:24 +01:00 committed by GitHub
parent b2bd270528
commit f6f3f99024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
apis/s3/src/test/java/org/jclouds/s3/binders/BindACLToXMLPayloadTest.java Normal file
View File

@ -0,0 +1,54 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jclouds.s3.binders;
import static org.testng.Assert.assertEquals;
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.Permission;
import org.jclouds.s3.domain.CanonicalUser;
import org.jclouds.util.Strings2;
import org.testng.annotations.Test;
/**
* 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 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("adrian@jclouds.org"),
Permission.FULL_CONTROL);
String expected = Strings2.toStringAndClose(getClass().getResourceAsStream(
"/acl_to_xml.xml"));
HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://test").build();
BindACLToXMLPayload binder = new BindACLToXMLPayload();
binder.bindToRequest(request, acl);
assertEquals(request.getPayload().getContentMetadata().getContentType(), "text/xml");
assertEquals(request.getPayload().getRawContent(), expected);
}
}

8
apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java
View File

@ -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("adrian@jclouds.org"),
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);
}
}

1
apis/s3/src/test/resources/acl_to_xml.xml Normal file
View File

@ -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>adrian@jclouds.org</EmailAddress></Grantee><Permission>FULL_CONTROL</Permission></Grant></AccessControlList></AccessControlPolicy>