Skip to content

Commit 5bb10b0

Browse files
peacekeeperpeacekeeper
committed
Fix unit tests.
Signed-off-by: Markus Sabadello <[email protected]>
1 parent d42f466 commit 5bb10b0

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ public void testSign() throws Exception {
3535

3636
assertNotNull(jwtString);
3737

38-
assertEquals(TestUtil.read(ValidateTest.class.getResourceAsStream("verifiable-credential.jwt.payload.jsonld")).trim(), jwtPayload.trim());
39-
assertEquals(TestUtil.read(ValidateTest.class.getResourceAsStream("verifiable-credential.jwt.jsonld")).trim(), jwtString.trim());
38+
assertEquals(TestUtil.read(VerifyTest.class.getResourceAsStream("verifiable-credential.jwt.payload.jsonld")).trim(), jwtPayload.trim());
39+
assertEquals(TestUtil.read(VerifyTest.class.getResourceAsStream("verifiable-credential.jwt.jsonld")).trim(), jwtString.trim());
4040
}
4141

4242
public void testVerify() throws Exception {
4343

44-
JwtVerifiableCredential jwtVerifiableCredential = JwtVerifiableCredential.fromJwt(TestUtil.read(ValidateTest.class.getResourceAsStream("verifiable-credential.jwt.jsonld")), AlgorithmIdentifiers.RSA_USING_SHA256, TestUtil.testRSAPublicKey);
44+
JwtVerifiableCredential jwtVerifiableCredential = JwtVerifiableCredential.fromJwt(TestUtil.read(VerifyTest.class.getResourceAsStream("verifiable-credential.jwt.jsonld")), AlgorithmIdentifiers.RSA_USING_SHA256, TestUtil.testRSAPublicKey);
4545

4646
String jwtPayload = jwtVerifiableCredential.getPayload().toJson();
4747
String jwtPayloadVerifiableCredential = jwtVerifiableCredential.getPayloadVerifiableCredential().toJsonString();
4848

4949
assertNotNull(jwtPayload);
5050
assertNotNull(jwtPayloadVerifiableCredential);
5151

52-
assertEquals(TestUtil.read(ValidateTest.class.getResourceAsStream("verifiable-credential.jwt.payload.jsonld")).trim(), jwtPayload.trim());
52+
assertEquals(TestUtil.read(VerifyTest.class.getResourceAsStream("verifiable-credential.jwt.payload.jsonld")).trim(), jwtPayload.trim());
5353

5454
VerifiableCredential verifiableCredential = jwtVerifiableCredential.toVerifiableCredential();
5555

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,18 @@ public void testSign() throws Exception {
2828
String domain = null;
2929
String nonce = "c0ae1c8e-c7e7-469f-b252-86e6a0e7387e";
3030

31-
RsaSignature2018LdSigner signer = new RsaSignature2018LdSigner(creator, created, domain, nonce, TestUtil.testRSAPrivateKey);
31+
RsaSignature2018LdSigner signer = new RsaSignature2018LdSigner(TestUtil.testRSAPrivateKey);
32+
signer.setCreator(creator);
33+
signer.setCreated(created);
34+
signer.setDomain(domain);
35+
signer.setNonce(nonce);
3236
LdSignature ldSignature = signer.sign(verifiableCredential.getJsonLdObject());
3337

3438
assertEquals(SignatureSuites.SIGNATURE_SUITE_RSASIGNATURE2018.getTerm(), ldSignature.getType());
3539
assertEquals(creator, ldSignature.getCreator());
3640
assertEquals(created, ldSignature.getCreated());
3741
assertEquals(domain, ldSignature.getDomain());
3842
assertEquals(nonce, ldSignature.getNonce());
39-
assertEquals("eyJhbGciOiJSUzI1NiIsImI2NCI6ZmFsc2UsImNyaXQiOlsiYjY0Il19..TF3iVD991QkINjdF-ohHs65DBwyoWZR-I-oC7H5u5Nb6cN4hEIHoIZHMYywDJ9qDwtoLL8sTOguEtuw2urK4juzwyUAOGtwF8QnsW162D0ty6frQ0gE3dWWdvDodAp_GtU_qFevkJ9-LMB-y8axn9X3lz3-8aWPnYju8uRZlLQ9HaUV8jQI4X7_BhNttUNc5WDweWl6Gp0wn_vhEA2OlYLfyIY-S3P6su4JUWdoRaQyguqkThL6dfDGHDaSH1JIDbakdUyZfiNqOrJ38qeabw2Pm883EpEJPwU-RptGM0-cm28b0hwgRVvRwOe8mhit6xtImrZWqpDfkNUoEOa4_HQ", ldSignature.getSignatureValue());
43+
assertEquals("eyJjcml0IjpbImI2NCJdLCJiNjQiOmZhbHNlLCJhbGciOiJSUzI1NiJ9..O_-LVz0SghpFOlO0xU1d7dk8rXpoQXpd1dBdGuXyjqE72bSZOn_C65M-_ZasNtgt0AxDmkdEFhb1Ji5hZmkuIm9qhMnZDiMMcn6FuMd0eQyYR2OqLOcxOLVdCjgJF4s7M_Mpl7CgZ1w5QnqIEgCp3kzYskvmJrqOsib4a-VXh7xAyA4Lo9edK02wF7t5BrjO6Yz9xaHjB2V9A-Vh3UEXj8kc3cE3M7rMiPlmAiZRdKpl9lVL0ANW1Y0sMPceL3CPoOsjTomfOnGxXylfnhemnVAjpVs5HhG4NlzBf9FT-YPlxfmzVSw1P6epIGSMq4nVXuRXlWD-E_4KcG6teUD3jQ", ldSignature.getSignatureValue());
4044
}
4145
}

src/test/java/com/danubetech/verifiablecredentials/ValidateTest.java renamed to src/test/java/com/danubetech/verifiablecredentials/VerifyTest.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
package com.danubetech.verifiablecredentials;
22
import java.util.LinkedHashMap;
33

4-
import com.danubetech.verifiablecredentials.VerifiableCredential;
54
import com.github.jsonldjava.utils.JsonUtils;
65

7-
import info.weboftrust.ldsignatures.validator.RsaSignature2018LdValidator;
6+
import info.weboftrust.ldsignatures.verifier.RsaSignature2018LdVerifier;
87
import junit.framework.TestCase;
98

10-
public class ValidateTest extends TestCase {
9+
public class VerifyTest extends TestCase {
1110

1211
@SuppressWarnings("unchecked")
13-
public void testValidate() throws Exception {
12+
public void testVerify() throws Exception {
1413

15-
LinkedHashMap<String, Object> jsonLdObject = (LinkedHashMap<String, Object>) JsonUtils.fromInputStream(ValidateTest.class.getResourceAsStream("verifiable-credential.ldp.good.jsonld"));
14+
LinkedHashMap<String, Object> jsonLdObject = (LinkedHashMap<String, Object>) JsonUtils.fromInputStream(VerifyTest.class.getResourceAsStream("verifiable-credential.ldp.good.jsonld"));
1615
VerifiableCredential verifiableCredential = VerifiableCredential.fromJsonLdObject(jsonLdObject);
1716

18-
RsaSignature2018LdValidator validator = new RsaSignature2018LdValidator(TestUtil.testRSAPublicKey);
19-
boolean validate = validator.validate(verifiableCredential.getJsonLdObject());
17+
RsaSignature2018LdVerifier verifier = new RsaSignature2018LdVerifier(TestUtil.testRSAPublicKey);
18+
boolean verify = verifier.verify(verifiableCredential.getJsonLdObject());
2019

21-
assertTrue(validate);
20+
assertTrue(verify);
2221

2322
LinkedHashMap<String, Object> jsonLdCredentialSubject = verifiableCredential.getJsonLdCredentialSubject();
2423
LinkedHashMap<String, Object> jsonLdDriversLicenseObject = (LinkedHashMap<String, Object>) jsonLdCredentialSubject.get("driversLicense");
@@ -28,14 +27,14 @@ public void testValidate() throws Exception {
2827
}
2928

3029
@SuppressWarnings("unchecked")
31-
public void testBadValidate() throws Exception {
30+
public void testBadVerify() throws Exception {
3231

33-
LinkedHashMap<String, Object> jsonLdObject = (LinkedHashMap<String, Object>) JsonUtils.fromInputStream(ValidateTest.class.getResourceAsStream("verifiable-credential.ldp.bad.jsonld"));
32+
LinkedHashMap<String, Object> jsonLdObject = (LinkedHashMap<String, Object>) JsonUtils.fromInputStream(VerifyTest.class.getResourceAsStream("verifiable-credential.ldp.bad.jsonld"));
3433
VerifiableCredential verifiableCredential = VerifiableCredential.fromJsonLdObject(jsonLdObject);
3534

36-
RsaSignature2018LdValidator validator = new RsaSignature2018LdValidator(TestUtil.testRSAPublicKey);
37-
boolean validate = validator.validate(verifiableCredential.getJsonLdObject());
35+
RsaSignature2018LdVerifier verifier = new RsaSignature2018LdVerifier(TestUtil.testRSAPublicKey);
36+
boolean verify = verifier.verify(verifiableCredential.getJsonLdObject());
3837

39-
assertFalse(validate);
38+
assertFalse(verify);
4039
}
4140
}

‎src/test/resources/com/danubetech/verifiablecredentials/verifiable-credential.jwt.jsonld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJ1cm46dXVpZDphODdiZGZiOC1hN2RmLTRiZDktYWUwZC1kODgzMTMzNTM4ZmUiLCJzdWIiOiJkaWQ6c292OjIxdERBS0NFUmg5NXVHZ0tiSk5IWXAiLCJpc3MiOiJkaWQ6c292OjF5dlhibWdQb1VtNGRsNjZEN0toeUQiLCJpYXQiOjE1NjA3MTE0MTksImV4cCI6MTU2MDc5NzgxOSwidmMiOnsiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiLCJodHRwczovL3RyYWZpLmZpL2NyZWRlbnRpYWxzL3YxIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJEcml2ZXJzTGljZW5zZUNyZWRlbnRpYWwiXSwiY3JlZGVudGlhbFN1YmplY3QiOnsiZHJpdmVyc0xpY2Vuc2UiOnsibGljZW5zZUNsYXNzIjoidHJ1Y2tzIn19fX0.FAuGkiVhfW2-9vmijXzcBoVaB4ygm28hcE9J5N6yZbPPNR_dcjhFOPDP3n3scHLNQ2rk4CQD6sOGA2p7FJfSlZZ4JnNkLmkBfPkzeXzn6O7gNRIatm7a7vJwJyYuvdA4GlbF6zAJqULT1nGO5DDEb52AY5-02vgJU5cPBG7sDljsw8zq_hmeXSMFVEw5A68GIh2_Wwefqhuy96aPdM6Rf69zPboxrLpPuq-LfS0cyOt4Jk27kqvZCl8xTrwA41iJGc3l2Rb0nA9jE11ppxb1JfrMbU3U4Nj50Z7mtIgtEYzembsw1sfCIZeTqjL-jlJku6b4Dofd_Qq-nOuj4HJ8TA
1+
eyJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJ1cm46dXVpZDphODdiZGZiOC1hN2RmLTRiZDktYWUwZC1kODgzMTMzNTM4ZmUiLCJzdWIiOiJkaWQ6c292OjIxdERBS0NFUmg5NXVHZ0tiSk5IWXAiLCJpc3MiOiJkaWQ6c292OjF5dlhibWdQb1VtNGRsNjZEN0toeUQiLCJuYmYiOjE1NjA3MTE0MTksImV4cCI6MTU2MDc5NzgxOSwidmMiOnsiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiLCJodHRwczovL3RyYWZpLmZpL2NyZWRlbnRpYWxzL3YxIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJEcml2ZXJzTGljZW5zZUNyZWRlbnRpYWwiXSwiY3JlZGVudGlhbFN1YmplY3QiOnsiZHJpdmVyc0xpY2Vuc2UiOnsibGljZW5zZUNsYXNzIjoidHJ1Y2tzIn19fX0.ZdJxM0kJakKAfJI2h3Dhvf_AHUgC8-NyQRr2DMnlzCxHZyVEji0s5Sl8cNx6aPwwjDagp2KHFy6M9eONHrrpdb49AuKetyJZQUoB5aQg-sC5GMHPVyeTxzazaDWysEiCZSXc6GcirLDmHXVWMUidKDlGh8vdUtrHR0ayVbxrXQ-zKakfltaRawQ4OIRPJ-0fssojSDbRO6KnrH6MQbsl-fwTRcYnlihNIHpNTEpT68DA3QzHU1-TAX1xY3Jx2vYorihFf02mnn5d3gW4Gv2KsNbNpewIAmfL-p-abOFNmt2cLxFUSLsgaE5upDw2xAGTc3lAxvbJ7Gm4eaL8SXTQ2A

‎src/test/resources/com/danubetech/verifiablecredentials/verifiable-credential.jwt.payload.jsonld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"jti":"urn:uuid:a87bdfb8-a7df-4bd9-ae0d-d883133538fe","sub":"did:sov:21tDAKCERh95uGgKbJNHYp","iss":"did:sov:1yvXbmgPoUm4dl66D7KhyD","iat":1560711419,"exp":1560797819,"vc":{"@context":["https://www.w3.org/2018/credentials/v1","https://trafi.fi/credentials/v1"],"type":["VerifiableCredential","DriversLicenseCredential"],"credentialSubject":{"driversLicense":{"licenseClass":"trucks"}}}}
1+
{"jti":"urn:uuid:a87bdfb8-a7df-4bd9-ae0d-d883133538fe","sub":"did:sov:21tDAKCERh95uGgKbJNHYp","iss":"did:sov:1yvXbmgPoUm4dl66D7KhyD","nbf":1560711419,"exp":1560797819,"vc":{"@context":["https://www.w3.org/2018/credentials/v1","https://trafi.fi/credentials/v1"],"type":["VerifiableCredential","DriversLicenseCredential"],"credentialSubject":{"driversLicense":{"licenseClass":"trucks"}}}}

0 commit comments

Comments
 (0)