github
/
acme4j
mirror of https://github.com/shred/acme4j
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix unit tests for Java 9

pull/38/head
Richard Körber 2017-09-30 18:03:08 +02:00
parent a7ce6a5f08
commit 8f7b45a69f
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java
View File

@ -27,6 +27,7 @@ import java.net.URL;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -255,7 +256,7 @@ public class DefaultConnectionTest {
*/ */
@Test @Test
public void testHandleRetryAfterHeaderDate() throws AcmeException, IOException { public void testHandleRetryAfterHeaderDate() throws AcmeException, IOException {
Instant retryDate = Instant.now().plus(Duration.ofHours(10)); Instant retryDate = Instant.now().plus(Duration.ofHours(10)).truncatedTo(ChronoUnit.MILLIS);
String retryMsg = "absolute date"; String retryMsg = "absolute date";
when(mockUrlConnection.getResponseCode()).thenReturn(HttpURLConnection.HTTP_ACCEPTED); when(mockUrlConnection.getResponseCode()).thenReturn(HttpURLConnection.HTTP_ACCEPTED);

16
acme4j-client/src/test/java/org/shredzone/acme4j/util/AcmeUtilsTest.java
View File

@ -26,8 +26,6 @@ import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import javax.xml.bind.DatatypeConverter;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.hamcrest.BaseMatcher; import org.hamcrest.BaseMatcher;
import org.hamcrest.Description; import org.hamcrest.Description;
@ -57,20 +55,10 @@ public class AcmeUtilsTest {
} }
/** /**
* Test sha-256 hash. * Test sha-256 hash and hex encode.
*/ */
@Test @Test
public void testSha256Hash() { public void testSha256HashHexEncode() {
byte[] hash = sha256hash("foobar");
byte[] expected = DatatypeConverter.parseHexBinary("c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2");
assertThat(hash, is(expected));
}
/**
* Test hex encode.
*/
@Test
public void testHexEncode() {
String hexEncode = hexEncode(sha256hash("foobar")); String hexEncode = hexEncode(sha256hash("foobar"));
assertThat(hexEncode, is("c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2")); assertThat(hexEncode, is("c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2"));
} }