Skip to content

Commit 03180cc

Browse files
dghgitdghgit
committed
removed use of "assert "
1 parent c8584e2 commit 03180cc

1 file changed

Lines changed: 17 additions & 18 deletions

File tree

‎pkix/src/test/java/org/bouncycastle/tsp/test/ERSTest.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.HashSet;
2121
import java.util.List;
2222

23-
import junit.framework.Assert;
2423
import junit.framework.TestCase;
2524
import org.bouncycastle.asn1.ASN1Encoding;
2625
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
@@ -111,7 +110,7 @@ public void testBasicBuild()
111110

112111
TimeStampRequest tspReq = ersGen.generateTimeStampRequest(tspReqGen);
113112

114-
Assert.assertTrue(Arrays.areEqual(Hex.decode("98fbf91c1aebdfec514d4a76532ec95f27ebcf4c8b6f7e2947afcbbfe7084cd4"),
113+
assertTrue(Arrays.areEqual(Hex.decode("98fbf91c1aebdfec514d4a76532ec95f27ebcf4c8b6f7e2947afcbbfe7084cd4"),
115114
tspReq.getMessageImprintDigest()));
116115

117116
String signDN = "O=Bouncy Castle, C=AU";
@@ -218,7 +217,7 @@ public void testBuildMultiGroups()
218217

219218
TimeStampRequest tspReq = ersGen.generateTimeStampRequest(tspReqGen);
220219

221-
Assert.assertTrue(Arrays.areEqual(Hex.decode("06836dfdec4b556e05535d5696b0e4add5cee7d765bcba1f4c1613ddb9176813"),
220+
assertTrue(Arrays.areEqual(Hex.decode("06836dfdec4b556e05535d5696b0e4add5cee7d765bcba1f4c1613ddb9176813"),
222221
tspReq.getMessageImprintDigest()));
223222

224223
String signDN = "O=Bouncy Castle, C=AU";
@@ -341,7 +340,7 @@ public void testBuildMulti()
341340

342341
TimeStampRequest tspReq = ersGen.generateTimeStampRequest(tspReqGen);
343342

344-
Assert.assertTrue(Arrays.areEqual(Hex.decode("b7efd5e742df672584e69b36ba5592748f841cc400ef989180aa2a69e43499e8"),
343+
assertTrue(Arrays.areEqual(Hex.decode("b7efd5e742df672584e69b36ba5592748f841cc400ef989180aa2a69e43499e8"),
345344
tspReq.getMessageImprintDigest()));
346345

347346
String signDN = "O=Bouncy Castle, C=AU";
@@ -519,7 +518,7 @@ public void testMonteMulti()
519518
}
520519
}
521520
}
522-
Assert.assertEquals(atss.size(), count);
521+
assertEquals(atss.size(), count);
523522
}
524523

525524
private void checkAbsent(ERSEvidenceRecord ats, ERSData data)
@@ -630,7 +629,7 @@ public void testBasicBuildEvidenceRecord()
630629

631630
TimeStampRequest tspReq = ersGen.generateTimeStampRequest(tspReqGen);
632631

633-
Assert.assertTrue(Arrays.areEqual(Hex.decode("98fbf91c1aebdfec514d4a76532ec95f27ebcf4c8b6f7e2947afcbbfe7084cd4"),
632+
assertTrue(Arrays.areEqual(Hex.decode("98fbf91c1aebdfec514d4a76532ec95f27ebcf4c8b6f7e2947afcbbfe7084cd4"),
634633
tspReq.getMessageImprintDigest()));
635634

636635

@@ -721,15 +720,15 @@ public void testBasicBuildEvidenceRecord()
721720

722721
Collection<ERSEvidenceRecord> recs = store.getMatches(new ERSEvidenceRecordSelector(h3Docs));
723722

724-
Assert.assertEquals(1, recs.size());
723+
assertEquals(1, recs.size());
725724
ERSEvidenceRecord r1 = (ERSEvidenceRecord)recs.iterator().next();
726725

727726
recs = store.getMatches(new ERSEvidenceRecordSelector(new ERSByteData(H3A_DATA)));
728727

729-
Assert.assertEquals(1, recs.size());
728+
assertEquals(1, recs.size());
730729
ERSEvidenceRecord r2 = (ERSEvidenceRecord)recs.iterator().next();
731730

732-
Assert.assertTrue(r2 == r1);
731+
assertTrue(r2 == r1);
733732
}
734733

735734
private void checkPresent(ERSEvidenceRecord ev, ERSData data)
@@ -1104,7 +1103,7 @@ public void test4NodeBuild()
11041103

11051104
TimeStampRequest tspReq = ersGen.generateTimeStampRequest(tspReqGen);
11061105

1107-
Assert.assertTrue(Arrays.areEqual(Hex.decode("d82fea0eaff4b12925a201dff2332965953ca38c1eef6c9e31b55bbce4ce2984"),
1106+
assertTrue(Arrays.areEqual(Hex.decode("d82fea0eaff4b12925a201dff2332965953ca38c1eef6c9e31b55bbce4ce2984"),
11081107
tspReq.getMessageImprintDigest()));
11091108

11101109
ersGen = new ERSArchiveTimeStampGenerator(digestCalculator);
@@ -1124,7 +1123,7 @@ public void test4NodeBuild()
11241123

11251124
tspReq = ersGen.generateTimeStampRequest(tspReqGen);
11261125

1127-
Assert.assertTrue(Arrays.areEqual(Hex.decode("d82fea0eaff4b12925a201dff2332965953ca38c1eef6c9e31b55bbce4ce2984"),
1126+
assertTrue(Arrays.areEqual(Hex.decode("d82fea0eaff4b12925a201dff2332965953ca38c1eef6c9e31b55bbce4ce2984"),
11281127
tspReq.getMessageImprintDigest()));
11291128
}
11301129

@@ -1172,7 +1171,7 @@ public void testDirUtil()
11721171

11731172
TimeStampRequest tspReq = ersGen.generateTimeStampRequest(tspReqGen);
11741173

1175-
Assert.assertTrue(Arrays.areEqual(Hex.decode("98fbf91c1aebdfec514d4a76532ec95f27ebcf4c8b6f7e2947afcbbfe7084cd4"),
1174+
assertTrue(Arrays.areEqual(Hex.decode("98fbf91c1aebdfec514d4a76532ec95f27ebcf4c8b6f7e2947afcbbfe7084cd4"),
11761175
tspReq.getMessageImprintDigest()));
11771176

11781177
deleteDirectory(rootDir);
@@ -1490,7 +1489,7 @@ private byte[] trimBytes(byte[] bytes)
14901489
final TimeStampRequest timeStampRequest = ersArchiveTimeStampGenerator.generateTimeStampRequest(timeStampRequestGenerator);
14911490

14921491

1493-
//Assert.assertTrue(Arrays.areEqual(Hex.decode("b7efd5e742df672584e69b36ba5592748f841cc400ef989180aa2a69e43499e8"),
1492+
//assertTrue(Arrays.areEqual(Hex.decode("b7efd5e742df672584e69b36ba5592748f841cc400ef989180aa2a69e43499e8"),
14941493
// tspReq.getMessageImprintDigest()));
14951494

14961495
final String signDN = "O=Bouncy Castle, C=AU";
@@ -1598,7 +1597,7 @@ public void testCompareStreamAndByteData () throws TSPException, ERSException, O
15981597
// Sanity check, make sure root hash of ER is what we expect.
15991598
byte[] sourceData = Strings.toUTF8ByteArray("foo");
16001599
byte[] sourceSha256 = MessageDigest.getInstance("SHA-256").digest(sourceData);
1601-
assert Arrays.areEqual(sourceSha256, ersEvidenceRecord.getPrimaryRootHash());
1600+
assertTrue(Arrays.areEqual(sourceSha256, ersEvidenceRecord.getPrimaryRootHash()));
16021601

16031602

16041603
// Generate hash renewal request using ERSInputStreamData.
@@ -1620,15 +1619,15 @@ public void testCompareStreamAndByteData () throws TSPException, ERSException, O
16201619

16211620

16221621
// check ERSByteData and ERSInputStreamData produce same output
1623-
assert Arrays.areEqual(byteDataReq.getMessageImprintDigest(),
1624-
streamDataReq.getMessageImprintDigest());
1622+
assertTrue(Arrays.areEqual(byteDataReq.getMessageImprintDigest(),
1623+
streamDataReq.getMessageImprintDigest()));
16251624

16261625

16271626
// Generate the digest we expect to see in the requests and compare.
16281627
byte[] expectedDigest = generateExpectedRequestDigest(sourceData, ersEvidenceRecord,
16291628
MessageDigest.getInstance("SHA-512"));
1630-
assert Arrays.areEqual(byteDataReq.getMessageImprintDigest(), expectedDigest);
1631-
assert Arrays.areEqual(streamDataReq.getMessageImprintDigest(), expectedDigest);
1629+
assertTrue(Arrays.areEqual(byteDataReq.getMessageImprintDigest(), expectedDigest));
1630+
assertTrue(Arrays.areEqual(streamDataReq.getMessageImprintDigest(), expectedDigest));
16321631
}
16331632

16341633
/** Based on RFC 4998 section 5.2. */

0 commit comments

Comments
 (0)