Skip to content

Commit 8e9b055

Browse files
peacekeeperpeacekeeper
committed
test: Some improvements to tests.
1 parent 4e0844a commit 8e9b055

File tree

6 files changed

+37
-12
lines changed

6 files changed

+37
-12
lines changed

‎src/test/java/com/danubetech/verifiablecredentials/SignCredentialTest.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.danubetech.verifiablecredentials;
22

3+
import com.danubetech.verifiablecredentials.validation.Validation;
34
import foundation.identity.jsonld.JsonLDUtils;
45
import info.weboftrust.ldsignatures.LdProof;
56
import info.weboftrust.ldsignatures.signer.RsaSignature2018LdSigner;
@@ -21,24 +22,26 @@ void testSign() throws Throwable {
2122

2223
VerifiableCredential verifiableCredential = VerifiableCredential.fromJson(new InputStreamReader(VerifyCredentialTest.class.getResourceAsStream("input.vc.jsonld")));
2324

24-
URI creator = URI.create("did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1");
25+
URI verificationMethod = URI.create("did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1");
2526
Date created = JsonLDUtils.DATE_FORMAT.parse("2018-01-01T21:19:10Z");
2627
String domain = null;
2728
String nonce = "c0ae1c8e-c7e7-469f-b252-86e6a0e7387e";
2829

2930
RsaSignature2018LdSigner signer = new RsaSignature2018LdSigner(TestUtil.testRSAPrivateKey);
30-
signer.setCreator(creator);
31+
signer.setVerificationMethod(verificationMethod);
3132
signer.setCreated(created);
3233
signer.setDomain(domain);
3334
signer.setNonce(nonce);
3435
LdProof ldProof = signer.sign(verifiableCredential, true, false);
3536

3637
assertEquals(SignatureSuites.SIGNATURE_SUITE_RSASIGNATURE2018.getTerm(), ldProof.getType());
37-
assertEquals(creator, ldProof.getCreator());
38+
assertEquals(verificationMethod, ldProof.getVerificationMethod());
3839
assertEquals(created, ldProof.getCreated());
3940
assertEquals(domain, ldProof.getDomain());
4041
assertEquals(nonce, ldProof.getNonce());
41-
assertEquals("eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..m-5V3caaBBVWldf9c83ve2gBfgDdZqVrBGQZl5flXwgskOTkBlEIODMkK0j203PeOIfHSYZUO5wj4bGCSHZ8ORaQWoJFX_znskHipBvH2wc4TBu4mgMIJefP14gl1kDGF6Vw_BtbP6EWpmm2dnhKztDo-X4XuUGpbyBJ-lVX_CGl0qftzPAZtabUEmc-dB911EfiNbslJ6qJYKd_r7D7scSVKnJtE0xXK4obrWJg2_tx-cD1KWtrJXf-wIXa43gdwlFcVLLrHvzglf-KkHezxI9Ee6RNcIP-YQNrsjNet4obRzZuwcQAJ8-pBwdF901AgDKAI0Q85cjy_LGbxqb0GA", ldProof.getJws());
42+
assertEquals("eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..Sn-LB5t_x-kh9mUDq1DaS1GScj3PY_2fMnNnhq09x-ZBf6_EzYfvgFOpEvdLUwxkJiEt7B2x-LGg7bp-o7UEGCbIxWdGUTG7BGAsKsU18hUwOHrVNZ6VHovbxeFgK0iNMn0MObDiGdQbYMG8C71m3AvquUP00-2UiDcqNxmGAYg5tHv7SHXLEgvaz7SnIkBklj1yj_TMXreSGa_okbXFYxh7SkMfFcxHbBFShr0Fzd8DTn8tr_WvPHR7Tx3bkJHmqFx9Wo-0e7FkLeICsgmBKa5Hzz-y_1yEQPsDaZRRsbXfBD4krL7WTplJtAwnQ5Sy-L9cwZzNhCQC6KsggGjTgQ", ldProof.getJws());
43+
44+
Validation.validate(verifiableCredential);
4245

4346
RsaSignature2018LdVerifier verifier = new RsaSignature2018LdVerifier(TestUtil.testRSAPublicKey);
4447
boolean verify = verifier.verify(verifiableCredential);

‎src/test/java/com/danubetech/verifiablecredentials/SignPresentationTest.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.danubetech.verifiablecredentials;
22

3+
import com.danubetech.verifiablecredentials.validation.Validation;
34
import foundation.identity.jsonld.JsonLDUtils;
45
import info.weboftrust.ldsignatures.LdProof;
56
import info.weboftrust.ldsignatures.signer.RsaSignature2018LdSigner;
@@ -21,24 +22,26 @@ void testSign() throws Throwable {
2122

2223
VerifiablePresentation verifiablePresentation = VerifiablePresentation.fromJson(new InputStreamReader(VerifyCredentialTest.class.getResourceAsStream("input.vp.jsonld")));
2324

24-
URI creator = URI.create("did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1");
25+
URI verificationMethod = URI.create("did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1");
2526
Date created = JsonLDUtils.DATE_FORMAT.parse("2018-01-01T21:19:10Z");
2627
String domain = null;
2728
String nonce = "c0ae1c8e-c7e7-469f-b252-86e6a0e7387e";
2829

2930
RsaSignature2018LdSigner signer = new RsaSignature2018LdSigner(TestUtil.testRSAPrivateKey);
30-
signer.setCreator(creator);
31+
signer.setVerificationMethod(verificationMethod);
3132
signer.setCreated(created);
3233
signer.setDomain(domain);
3334
signer.setNonce(nonce);
3435
LdProof ldSignature = signer.sign(verifiablePresentation, true, false);
3536

3637
assertEquals(SignatureSuites.SIGNATURE_SUITE_RSASIGNATURE2018.getTerm(), ldSignature.getType());
37-
assertEquals(creator, ldSignature.getCreator());
38+
assertEquals(verificationMethod, ldSignature.getVerificationMethod());
3839
assertEquals(created, ldSignature.getCreated());
3940
assertEquals(domain, ldSignature.getDomain());
4041
assertEquals(nonce, ldSignature.getNonce());
41-
assertEquals("eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..VqTXD63c1DN1saWhkRz-RJL2VMbzNrNQSBcdkLQ82Cv04YcsdmSDJe0odqEDxk77B81zTXpIyeYxUoz8kYzL3vCtaoJTFOUmBLjztBEendyC3EJlH0XL1TEpXoAxBe5J3GLp5CVOphDEfc5SHQz0lVBP3ssX844ndxFgPzJGmLykoLTr7QmRDFkAAErJEEWDsJpTHP1V9MGLsMfbpgPIwmcLutK8mKJcDN7hnjGnHbua3nLQSb5aO6Pdduz9SSCFNk8TDqzowVymuI3wPsZjNBDePZgGIu1b016D0MkkwH7Xy0jZ2JReRPph4VX2TANSTjDeXQ4dSEupyLwd1wWljQ", ldSignature.getJws());
42+
assertEquals("eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..PexTQ753-C3IjZwC0F5yA-06EuiM_McqPBRcyPhHw0PdCaVdvK628kqG8PWABJ1oISU8Z75lzpfhwNwD2qRiPTLg6uQqbmm8p633hM0HCIih8Uf3QzflrUlxfPIiAdUmWZiNRHNPbm4KD4hvPl4S0kYmCLJEp0evMbazZHKgnKOzzGsvOIqpCwheH30uzbk5--z8XJGflMLEHqrp42DWuYB8y9l_yn830mC6xAzWe25KRSbODDk2xy1gjIcMeBYPkMuZ4MCamRUYsPuj-aLHq8q8iDrhUoUDH307v0OevDlyu6cG7_H0bgG6fGTzAT5EGkb-EhE3NfAvKo7nh3d6Mw", ldSignature.getJws());
43+
44+
Validation.validate(verifiablePresentation);
4245

4346
RsaSignature2018LdVerifier verifier = new RsaSignature2018LdVerifier(TestUtil.testRSAPublicKey);
4447
boolean verify = verifier.verify(verifiablePresentation);

‎src/test/java/com/danubetech/verifiablecredentials/VerifyCredentialTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.danubetech.verifiablecredentials;
22

3+
import com.danubetech.verifiablecredentials.validation.Validation;
34
import info.weboftrust.ldsignatures.verifier.RsaSignature2018LdVerifier;
45
import org.junit.jupiter.api.Test;
56

@@ -14,6 +15,8 @@ void testVerify() throws Throwable {
1415

1516
VerifiableCredential verifiableCredential = VerifiableCredential.fromJson(new InputStreamReader(VerifyCredentialTest.class.getResourceAsStream("signed.good.vc.jsonld")));
1617

18+
Validation.validate(verifiableCredential);
19+
1720
RsaSignature2018LdVerifier verifier = new RsaSignature2018LdVerifier(TestUtil.testRSAPublicKey);
1821
boolean verify = verifier.verify(verifiableCredential);
1922

@@ -30,6 +33,8 @@ void testBadVerify() throws Throwable {
3033

3134
VerifiableCredential verifiableCredential = VerifiableCredential.fromJson(new InputStreamReader(VerifyCredentialTest.class.getResourceAsStream("signed.bad.vc.jsonld")));
3235

36+
Validation.validate(verifiableCredential);
37+
3338
RsaSignature2018LdVerifier verifier = new RsaSignature2018LdVerifier(TestUtil.testRSAPublicKey);
3439
boolean verify = verifier.verify(verifiableCredential);
3540

‎src/test/java/com/danubetech/verifiablecredentials/VerifyPresentationTest.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.danubetech.keyformats.crypto.provider.impl.JavaRandomProvider;
99
import com.danubetech.keyformats.crypto.provider.impl.JavaSHA256Provider;
1010
import com.danubetech.keyformats.crypto.provider.impl.TinkEd25519Provider;
11+
import com.danubetech.verifiablecredentials.validation.Validation;
1112
import info.weboftrust.ldsignatures.verifier.Ed25519Signature2018LdVerifier;
1213
import org.bitcoinj.core.Base58;
1314
import org.junit.jupiter.api.BeforeEach;
@@ -65,6 +66,19 @@ public void before() {
6566
Ed25519Provider.set(new TinkEd25519Provider());
6667
}
6768

69+
@Test
70+
void testValidity() {
71+
72+
Validation.validate(verifiablePresentationGood1);
73+
Validation.validate(verifiablePresentationGood2);
74+
Validation.validate(verifiablePresentationBad1);
75+
Validation.validate(verifiablePresentationBad2);
76+
Validation.validate(verifiableCredentialGood1);
77+
Validation.validate(verifiableCredentialGood2);
78+
Validation.validate(verifiableCredentialBad1);
79+
Validation.validate(verifiableCredentialBad2);
80+
}
81+
6882
/*
6983
* GOOD CREDENTIAL
7084
*/

‎src/test/resources/com/danubetech/verifiablecredentials/signed.bad.vc.jsonld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
},
2222
"proof" : {
2323
"type" : "RsaSignature2018",
24-
"creator" : "did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1",
24+
"verificationMethod" : "did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1",
2525
"created" : "2018-01-01T21:19:10Z",
2626
"nonce" : "c0ae1c8e-c7e7-469f-b252-86e6a0e7387e",
27-
"jws" : "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..m-5V3caaBBVWldf9c83ve2gBfgDdZqVrBGQZl5flXwgskOTkBlEIODMkK0j203PeOIfHSYZUO5wj4bGCSHZ8ORaQWoJFX_znskHipBvH2wc4TBu4mgMIJefP14gl1kDGF6Vw_BtbP6EWpmm2dnhKztDo-X4XuUGpbyBJ-lVX_CGl0qftzPAZtabUEmc-dB911EfiNbslJ6qJYKd_r7D7scSVKnJtE0xXK4obrWJg2_tx-cD1KWtrJXf-wIXa43gdwlFcVLLrHvzglf-KkHezxI9Ee6RNcIP-YQNrsjNet4obRzZuwcQAJ8-pBwdF901AgDKAI0Q85cjy_LGbxqb0GA"
27+
"jws" : "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..Sn-LB5t_x-kh9mUDq1DaS1GScj3PY_2fMnNnhq09x-ZBf6_EzYfvgFOpEvdLUwxkJiEt7B2x-LGg7bp-o7UEGCbIxWdGUTG7BGAsKsU18hUwOHrVNZ6VHovbxeFgK0iNMn0MObDiGdQbYMG8C71m3AvquUP00-2UiDcqNxmGAYg5tHv7SHXLEgvaz7SnIkBklj1yj_TMXreSGa_okbXFYxh7SkMfFcxHbBFShr0Fzd8DTn8tr_WvPHR7Tx3bkJHmqFx9Wo-0e7FkLeICsgmBKa5Hzz-y_1yEQPsDaZRRsbXfBD4krL7WTplJtAwnQ5Sy-L9cwZzNhCQC6KsggGjTgQ"
2828
}
2929
}

‎src/test/resources/com/danubetech/verifiablecredentials/signed.good.vc.jsonld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
},
2222
"proof" : {
2323
"type" : "RsaSignature2018",
24-
"creator" : "did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1",
24+
"verificationMethod" : "did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1",
2525
"created" : "2018-01-01T21:19:10Z",
2626
"nonce" : "c0ae1c8e-c7e7-469f-b252-86e6a0e7387e",
27-
"jws" : "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..m-5V3caaBBVWldf9c83ve2gBfgDdZqVrBGQZl5flXwgskOTkBlEIODMkK0j203PeOIfHSYZUO5wj4bGCSHZ8ORaQWoJFX_znskHipBvH2wc4TBu4mgMIJefP14gl1kDGF6Vw_BtbP6EWpmm2dnhKztDo-X4XuUGpbyBJ-lVX_CGl0qftzPAZtabUEmc-dB911EfiNbslJ6qJYKd_r7D7scSVKnJtE0xXK4obrWJg2_tx-cD1KWtrJXf-wIXa43gdwlFcVLLrHvzglf-KkHezxI9Ee6RNcIP-YQNrsjNet4obRzZuwcQAJ8-pBwdF901AgDKAI0Q85cjy_LGbxqb0GA"
27+
"jws" : "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..Sn-LB5t_x-kh9mUDq1DaS1GScj3PY_2fMnNnhq09x-ZBf6_EzYfvgFOpEvdLUwxkJiEt7B2x-LGg7bp-o7UEGCbIxWdGUTG7BGAsKsU18hUwOHrVNZ6VHovbxeFgK0iNMn0MObDiGdQbYMG8C71m3AvquUP00-2UiDcqNxmGAYg5tHv7SHXLEgvaz7SnIkBklj1yj_TMXreSGa_okbXFYxh7SkMfFcxHbBFShr0Fzd8DTn8tr_WvPHR7Tx3bkJHmqFx9Wo-0e7FkLeICsgmBKa5Hzz-y_1yEQPsDaZRRsbXfBD4krL7WTplJtAwnQ5Sy-L9cwZzNhCQC6KsggGjTgQ"
2828
}
2929
}

0 commit comments

Comments
 (0)