This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 32360ef0dadf73fc8c31b581139b55a98272bdc7
Author: Jesse Rivas <jesse_ri...@comcast.com>
AuthorDate: Fri Feb 23 13:52:38 2018 -0700
Corrected imports, fixed shared/pom.xml
---
.../jdnssec/dns/keys/SigningTestDataGenerator.java | 2 +-
.../jdnssec/dns/keys/ZoneSignerTest.java | 43 ++++++++++++----------
traffic_router/shared/pom.xml | 10 +----
.../traffic_router/shared/ZoneTestRecords.java | 9 +++--
4 files changed, 32 insertions(+), 32 deletions(-)
diff --git
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/SigningTestDataGenerator.java
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/SigningTestDataGenerator.java
index 9c25669..5d515d2 100644
---
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/SigningTestDataGenerator.java
+++
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/SigningTestDataGenerator.java
@@ -15,6 +15,7 @@
package com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.keys;
+import com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords;
import com.verisignlabs.dnssec.security.DnsKeyPair;
import com.verisignlabs.dnssec.security.JCEDnsSecSigner;
import org.junit.Before;
@@ -25,7 +26,6 @@ import org.xbill.DNS.DSRecord;
import org.xbill.DNS.Name;
import org.xbill.DNS.Record;
import org.xbill.DNS.Section;
-import com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords;
import sun.security.rsa.RSAPrivateCrtKeyImpl;
import java.io.IOException;
diff --git
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/ZoneSignerTest.java
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/ZoneSignerTest.java
index cd0bf53..a727299 100644
---
a/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/ZoneSignerTest.java
+++
b/traffic_router/jdnssec/src/test/java/com/comcast/cdn/traffic_control/traffic_router/jdnssec/dns/keys/ZoneSignerTest.java
@@ -15,12 +15,14 @@
package com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.keys;
+import com.comcast.cdn.traffic_control.traffic_router.shared.IsEqualCollection;
import
com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.DNSKeyPairWrapper;
import com.comcast.cdn.traffic_control.traffic_router.core.dns.DnsSecKeyPair;
import
com.comcast.cdn.traffic_control.traffic_router.core.dns.DnsSecKeyPairImpl;
import
com.comcast.cdn.traffic_control.traffic_router.jdnssec.dns.JDnsSecSigner;
import com.comcast.cdn.traffic_control.traffic_router.core.dns.ZoneSignerImpl;
-import com.comcast.cdn.traffic_control.traffic_router.shared.IsEqualCollection;
+import com.comcast.cdn.traffic_control.traffic_router.shared.SigningData;
+import com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.verisignlabs.dnssec.security.DnsKeyPair;
@@ -30,14 +32,17 @@ import org.junit.Before;
import org.junit.Test;
import org.xbill.DNS.DSRecord;
import org.xbill.DNS.Record;
-import com.comcast.cdn.traffic_control.traffic_router.shared.SigningData;
-import com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
import static
com.comcast.cdn.traffic_control.traffic_router.shared.IsEqualCollection.equalTo;
+import static
com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords.keySigningKeyRecord;
+import static
com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords.origin;
+import static
com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords.sep_1_2016;
+import static
com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords.sep_1_2026;
+import static
com.comcast.cdn.traffic_control.traffic_router.shared.ZoneTestRecords.zoneSigningKeyRecord;
import static java.util.Arrays.asList;
import static java.util.Base64.getMimeDecoder;
import static java.util.stream.Collectors.toList;
@@ -66,10 +71,10 @@ public class ZoneSignerTest {
final ObjectMapper mapper = new ObjectMapper();
- kskPair1 = new DnsKeyPair(ZoneTestRecords.keySigningKeyRecord,
decodePrivateKeyString(SigningData.ksk1Private));
- kskPair2 = new DnsKeyPair(ZoneTestRecords.keySigningKeyRecord,
decodePrivateKeyString(SigningData.ksk2Private));
- zskPair1 = new DnsKeyPair(ZoneTestRecords.zoneSigningKeyRecord,
decodePrivateKeyString(SigningData.zsk1Private));
- zskPair2 = new DnsKeyPair(ZoneTestRecords.zoneSigningKeyRecord,
decodePrivateKeyString(SigningData.zsk2Private));
+ kskPair1 = new DnsKeyPair(keySigningKeyRecord,
decodePrivateKeyString(SigningData.ksk1Private));
+ kskPair2 = new DnsKeyPair(keySigningKeyRecord,
decodePrivateKeyString(SigningData.ksk2Private));
+ zskPair1 = new DnsKeyPair(zoneSigningKeyRecord,
decodePrivateKeyString(SigningData.zsk1Private));
+ zskPair2 = new DnsKeyPair(zoneSigningKeyRecord,
decodePrivateKeyString(SigningData.zsk2Private));
// Data like we would fetch from traffic ops api for
dnsseckeys.json
String s = "{" +
@@ -124,11 +129,11 @@ public class ZoneSignerTest {
JCEDnsSecSigner signer = new JCEDnsSecSigner(false);
- final List<Record> signedRecords =
signer.signZone(ZoneTestRecords.origin, ZoneTestRecords.records,
- kskPairs, zskPairs, ZoneTestRecords.sep_1_2016,
ZoneTestRecords.sep_1_2026, true, SHA256_DIGEST_ID);
+ final List<Record> signedRecords = signer.signZone(origin,
ZoneTestRecords.records,
+ kskPairs, zskPairs, sep_1_2016, sep_1_2026, true,
SHA256_DIGEST_ID);
- assertThat(signedRecords,
IsEqualCollection.equalTo(SigningData.signedList));
- assertThat(ZoneTestRecords.records,
IsEqualCollection.equalTo(SigningData.postZoneList));
+ assertThat(signedRecords, equalTo(SigningData.signedList));
+ assertThat(ZoneTestRecords.records,
equalTo(SigningData.postZoneList));
}
@Test
@@ -153,11 +158,11 @@ public class ZoneSignerTest {
List<DnsSecKeyPair> zskWrapperPairs = new
ArrayList<>(asList(zsk1Wrapper, zsk2Wrapper));
- final List<Record> signedRecords2 = new
JDnsSecSigner().signZone(ZoneTestRecords.origin, ZoneTestRecords.records,
- kskWrapperPairs, zskWrapperPairs,
ZoneTestRecords.sep_1_2016, ZoneTestRecords.sep_1_2026, true, SHA256_DIGEST_ID);
+ final List<Record> signedRecords2 = new
JDnsSecSigner().signZone(origin, ZoneTestRecords.records,
+ kskWrapperPairs, zskWrapperPairs, sep_1_2016,
sep_1_2026, true, SHA256_DIGEST_ID);
- assertThat(signedRecords2,
IsEqualCollection.equalTo(SigningData.signedList));
- assertThat(ZoneTestRecords.records,
IsEqualCollection.equalTo(SigningData.postZoneList));
+ assertThat(signedRecords2, equalTo(SigningData.signedList));
+ assertThat(ZoneTestRecords.records,
equalTo(SigningData.postZoneList));
}
@Test
@@ -170,11 +175,11 @@ public class ZoneSignerTest {
List<DnsSecKeyPair> kskPairs = new ArrayList<>(asList(kskPair1,
kskPair2));
List<DnsSecKeyPair> zskPairs = new ArrayList<>(asList(zskPair1,
zskPair2));
- final List<Record> signedRecords = new
ZoneSignerImpl().signZone(ZoneTestRecords.origin, ZoneTestRecords.records,
- kskPairs, zskPairs, ZoneTestRecords.sep_1_2016,
ZoneTestRecords.sep_1_2026, true, SHA256_DIGEST_ID);
+ final List<Record> signedRecords = new
ZoneSignerImpl().signZone(origin, ZoneTestRecords.records,
+ kskPairs, zskPairs, sep_1_2016, sep_1_2026, true,
SHA256_DIGEST_ID);
- assertThat("Signed records not equal", signedRecords,
IsEqualCollection.equalTo(SigningData.signedList));
- assertThat("Post Zone Records not equal",
ZoneTestRecords.records, IsEqualCollection.equalTo(SigningData.postZoneList));
+ assertThat("Signed records not equal", signedRecords,
equalTo(SigningData.signedList));
+ assertThat("Post Zone Records not equal",
ZoneTestRecords.records, equalTo(SigningData.postZoneList));
}
@Test
diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml
index 882905a..46a60d3 100644
--- a/traffic_router/shared/pom.xml
+++ b/traffic_router/shared/pom.xml
@@ -76,6 +76,7 @@ under the License.
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
@@ -98,15 +99,6 @@ under the License.
<artifactId>dnsjava</artifactId>
<version>2.1.7</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
diff --git
a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/ZoneTestRecords.java
b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/ZoneTestRecords.java
index 196fdac..0b8f7d3 100644
---
a/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/ZoneTestRecords.java
+++
b/traffic_router/shared/src/main/java/com/comcast/cdn/traffic_control/traffic_router/shared/ZoneTestRecords.java
@@ -27,7 +27,6 @@ import org.xbill.DNS.Name;
import org.xbill.DNS.Record;
import org.xbill.DNS.TXTRecord;
import org.xbill.DNS.SOARecord;
-import org.xbill.DNS.DNSSEC;
import java.net.Inet6Address;
import java.net.InetAddress;
@@ -44,6 +43,10 @@ import java.util.Date;
import java.util.List;
import static java.util.Base64.getMimeDecoder;
+import static org.xbill.DNS.DNSKEYRecord.Flags.SEP_KEY;
+import static org.xbill.DNS.DNSKEYRecord.Flags.ZONE_KEY;
+import static org.xbill.DNS.DNSKEYRecord.Protocol.DNSSEC;
+import static org.xbill.DNS.DNSSEC.Algorithm.RSASHA1;
@SuppressWarnings("PMD")
public class ZoneTestRecords {
@@ -136,10 +139,10 @@ public class ZoneTestRecords {
}
zoneSigningKeyRecord = new DNSKEYRecord(origin, DClass.IN,
31556952L,
- DNSKEYRecord.Flags.ZONE_KEY,
DNSKEYRecord.Protocol.DNSSEC, DNSSEC.Algorithm.RSASHA1,
zsk1.getPublic().getEncoded());
+ ZONE_KEY, DNSSEC, RSASHA1,
zsk1.getPublic().getEncoded());
keySigningKeyRecord = new DNSKEYRecord(origin, DClass.IN,
315569520L,
- DNSKEYRecord.Flags.ZONE_KEY |
DNSKEYRecord.Flags.SEP_KEY, DNSKEYRecord.Protocol.DNSSEC,
DNSSEC.Algorithm.RSASHA1, ksk1.getPublic().getEncoded());
+ ZONE_KEY | SEP_KEY, DNSSEC, RSASHA1,
ksk1.getPublic().getEncoded());
return records;
}
}
--
To stop receiving notification emails like this one, please contact
els...@apache.org.
