Skip to content

Commit fb9bf60

Browse files
peacekeeperpeacekeeper
committed
Update unit tests.
Signed-off-by: Markus Sabadello <[email protected]>
1 parent 20728fb commit fb9bf60

File tree

10 files changed

+17
-21
lines changed

10 files changed

+17
-21
lines changed

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
import java.net.URI;
88
import java.security.GeneralSecurityException;
99
import java.text.SimpleDateFormat;
10-
import java.util.HashMap;
11-
import java.util.Map;
12-
import java.util.TimeZone;
10+
import java.util.*;
1311

1412
import com.danubetech.verifiablecredentials.jwt.FromJwtConverter;
1513
import com.danubetech.verifiablecredentials.jwt.ToJwtConverter;
@@ -23,7 +21,7 @@
2321
import javax.json.JsonObject;
2422
import javax.json.JsonValue;
2523

26-
class JwtTest {
24+
public class JwtTest {
2725

2826
static RSAKey rsaKey;
2927

@@ -35,13 +33,12 @@ class JwtTest {
3533
@Test
3634
void testSign() throws Exception {
3735

38-
/*
39-
* SKIP FOR NOW
40-
41-
Map<String, JsonValue> claims = new HashMap<>();
36+
Map<String, JsonValue> claims = new LinkedHashMap<>();
4237
JsonObject jsonLdDriversLicenseObject = Json.createObjectBuilder()
43-
.add("licenseClass", "trucks")
38+
.add("licenseClass", Json.createValue("trucks"))
39+
.add("suspended", JsonValue.FALSE)
4440
.build();
41+
claims.put("name", Json.createValue("M S"));
4542
claims.put("driversLicense", jsonLdDriversLicenseObject);
4643

4744
CredentialSubject credentialSubject = CredentialSubject.builder()
@@ -68,7 +65,6 @@ void testSign() throws Exception {
6865

6966
assertEquals(TestUtil.read(VerifyCredentialTest.class.getResourceAsStream("jwt.vc.jsonld")).trim(), jwtString.trim());
7067
assertEquals(TestUtil.read(VerifyCredentialTest.class.getResourceAsStream("jwt.payload.vc.jsonld")).trim(), jwtPayload.trim());
71-
*/
7268
}
7369

7470
@Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import info.weboftrust.ldsignatures.signer.RsaSignature2018LdSigner;
1818
import info.weboftrust.ldsignatures.suites.SignatureSuites;
1919

20-
class SignCredentialTest {
20+
public class SignCredentialTest {
2121

2222
@Test
2323
void testSign() throws Throwable {
@@ -41,7 +41,7 @@ void testSign() throws Throwable {
4141
assertEquals(created, ldProof.getCreated());
4242
assertEquals(domain, ldProof.getDomain());
4343
assertEquals(nonce, ldProof.getNonce());
44-
assertEquals("eyJjcml0IjpbImI2NCJdLCJiNjQiOmZhbHNlLCJhbGciOiJSUzI1NiJ9..pZtcYsR_vEtm5ZLEGNJZPYuWQeD_drBG55gDrX4V-Zxe-R0ue90QzfLn9ZAheBrnWxQNobOsmc0wLBLnSNp5fMbmxHzaMuPadkMXgyqdgH6r13YHidLhtsg8OWGBU0nlFQe5NPztP8HJdgdTmK8ohQlx1pB7BQuB3-iY_cHO7PLuVJFplI616v7zINW46SNc6PE2cJ_O-dnehA_PaNCnUn7s-TfqTYC7LQ2N95XImBt9zW5DYE7NRY7ZZh1sBNaSnHweOYZay-W6u789J3zTFxgbl-hZGziFA4EOJoWUAdb1vCBzlBWasfmkD0LAxlv7UV0Fp3wG2laIFiTwgrm9eg", ldProof.getJws());
44+
assertEquals("eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..m-5V3caaBBVWldf9c83ve2gBfgDdZqVrBGQZl5flXwgskOTkBlEIODMkK0j203PeOIfHSYZUO5wj4bGCSHZ8ORaQWoJFX_znskHipBvH2wc4TBu4mgMIJefP14gl1kDGF6Vw_BtbP6EWpmm2dnhKztDo-X4XuUGpbyBJ-lVX_CGl0qftzPAZtabUEmc-dB911EfiNbslJ6qJYKd_r7D7scSVKnJtE0xXK4obrWJg2_tx-cD1KWtrJXf-wIXa43gdwlFcVLLrHvzglf-KkHezxI9Ee6RNcIP-YQNrsjNet4obRzZuwcQAJ8-pBwdF901AgDKAI0Q85cjy_LGbxqb0GA", ldProof.getJws());
4545

4646
RsaSignature2018LdVerifier verifier = new RsaSignature2018LdVerifier(TestUtil.testRSAPublicKey);
4747
boolean verify = verifier.verify(verifiableCredential);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import static org.junit.jupiter.api.Assertions.assertEquals;
1717
import static org.junit.jupiter.api.Assertions.assertTrue;
1818

19-
class SignPresentationTest {
19+
public class SignPresentationTest {
2020

2121
@Test
2222
void testSign() throws Throwable {
@@ -40,7 +40,7 @@ void testSign() throws Throwable {
4040
assertEquals(created, ldSignature.getCreated());
4141
assertEquals(domain, ldSignature.getDomain());
4242
assertEquals(nonce, ldSignature.getNonce());
43-
assertEquals("eyJjcml0IjpbImI2NCJdLCJiNjQiOmZhbHNlLCJhbGciOiJSUzI1NiJ9..R1b-LuaT2_UxPDoLAUUSMrkZt3m51ukSz7nBMr8TMETIpQIaqM_o8r7aB3_NeGJk5o-U3T6WP7W7UhFU-Gkiqtk_b9CWZYVbaGt9SSztf6ElhsbJ4alxj-1j77Vhub671UYGDrRBtH1I0gG5hu4eSE6TsDlUMdTKgwC27XKzJobEwWU65VGxBWSPAywDzjbA3GERK8e6_8pxz7CrVUDcVqdJz11293bsYPYNi4-59Am59G3H5RywwwFs_La_AROTqpAD9UJasITr2N1lRvQG3IOe6vhtQd_ROAYdue-BUqrKH0sTsLmOvnRqEIYB3EnruGiB-2X5-4aAFwzkT_wx-w", ldSignature.getJws());
43+
assertEquals("eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..VqTXD63c1DN1saWhkRz-RJL2VMbzNrNQSBcdkLQ82Cv04YcsdmSDJe0odqEDxk77B81zTXpIyeYxUoz8kYzL3vCtaoJTFOUmBLjztBEendyC3EJlH0XL1TEpXoAxBe5J3GLp5CVOphDEfc5SHQz0lVBP3ssX844ndxFgPzJGmLykoLTr7QmRDFkAAErJEEWDsJpTHP1V9MGLsMfbpgPIwmcLutK8mKJcDN7hnjGnHbua3nLQSb5aO6Pdduz9SSCFNk8TDqzowVymuI3wPsZjNBDePZgGIu1b016D0MkkwH7Xy0jZ2JReRPph4VX2TANSTjDeXQ4dSEupyLwd1wWljQ", ldSignature.getJws());
4444

4545
RsaSignature2018LdVerifier verifier = new RsaSignature2018LdVerifier(TestUtil.testRSAPublicKey);
4646
boolean verify = verifier.verify(verifiablePresentation);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.bitcoinj.core.Base58;
1515
import org.bitcoinj.core.ECKey;
1616

17-
class TestUtil {
17+
public class TestUtil {
1818

1919
static final String testEd25519PrivateKeyString =
2020
"43bt2CEvmvm538bQ6YAnpfWTq5xisAB5Kqz7uiob9sabHsZp2HtFEFXRPGa5Mvdhw5xPEABrLduxFu5vt3AViEgF";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import static org.junit.jupiter.api.Assertions.*;
1010

11-
class VerifyCredentialTest {
11+
public class VerifyCredentialTest {
1212

1313
@Test
1414
void testVerify() throws Throwable {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import javax.json.JsonObject;
1515

16-
class VerifyPresentationTest {
16+
public class VerifyPresentationTest {
1717

1818
final static byte[] publicKeyPresentation1;
1919
final static byte[] publicKeyPresentation2;

‎src/test/resources/com/danubetech/verifiablecredentials/jwt.payload.vc.jsonld‎

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

‎src/test/resources/com/danubetech/verifiablecredentials/jwt.vc.jsonld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJkaWQ6c292OjIxdERBS0NFUmg5NXVHZ0tiSk5IWXAiLCJuYmYiOjE1NjA3MTE0MTksImlzcyI6ImRpZDpzb3Y6MXl2WGJtZ1BvVW00ZGw2NkQ3S2h5RCIsImV4cCI6MTU2MDc5NzgxOSwidmMiOnsiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiLCJodHRwczovL3RyYWZpLmZpL2NyZWRlbnRpYWxzL3YxIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJEcml2ZXJzTGljZW5zZUNyZWRlbnRpYWwiXSwiY3JlZGVudGlhbFN1YmplY3QiOnsiZHJpdmVyc0xpY2Vuc2UiOnsibGljZW5zZUNsYXNzIjoidHJ1Y2tzIn19fSwianRpIjoidXJuOnV1aWQ6YTg3YmRmYjgtYTdkZi00YmQ5LWFlMGQtZDg4MzEzMzUzOGZlIn0.MAUG-3uOeeie1BJCZsIGmTVjvNqzFUdfI73yrVO6HkDcyLZxeXr8pw8hjVYYaZERwPwAurqHzH3AJqNesPMjdLecl6yyBZLHnO6jQUCyMN9ejYVvR9CTkLnV5o0ZEzq7PCkvkSW4wDrULhAzvWHAlBok5z8345ZrsKTJYiLELr_d2T0cfL5CMEvEE1W3bPipukg--cJ_VBPaTBVEvBQ7JshXtlql2NMQ213KUPKdrkXMBgtIALcR3BiurhRGmO8EvQWnqaLa_Y4lHAi7Btxqd-KqNoOaph0Tedqm8Q0Vvr7HSoafoE40msCatpwgGxMW3jTNsNzXYxaKTnzSssxeBw
1+
eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJkaWQ6c292OjIxdERBS0NFUmg5NXVHZ0tiSk5IWXAiLCJuYmYiOjE1NjA3MTE0MTksImlzcyI6ImRpZDpzb3Y6MXl2WGJtZ1BvVW00ZGw2NkQ3S2h5RCIsImV4cCI6MTU2MDc5NzgxOSwidmMiOnsiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiLCJodHRwczovL3RyYWZpLmZpL2NyZWRlbnRpYWxzL3YxIl0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJEcml2ZXJzTGljZW5zZUNyZWRlbnRpYWwiXSwiY3JlZGVudGlhbFN1YmplY3QiOnsibmFtZSI6Ik0gUyIsImRyaXZlcnNMaWNlbnNlIjp7ImxpY2Vuc2VDbGFzcyI6InRydWNrcyIsInN1c3BlbmRlZCI6ZmFsc2V9fX0sImp0aSI6InVybjp1dWlkOmE4N2JkZmI4LWE3ZGYtNGJkOS1hZTBkLWQ4ODMxMzM1MzhmZSJ9.AqHN81vF8JU46J5AyEQfHEeiklFWAxB6ZOdWz2UmkAZMO4F_SKCrZcoaeAS7qxxeMCHBEfrgJoHRS4PGRmCjOd1LLz4-nyE-A_GC1sf8m6oUvhU55HzZWUaYA0YnVBMcWzt0wHkgna2GI-5ca_BQJYFmqCiKidBCseEMRiDpggP24It9HYWZGaIoEDKAkjHDnWmGg_NO96R4IXd4Opsb2nXf3HGCEtNYy03UprKJcr4Nhme5b_0Ow2m5Q7TMDsgRhVMO3zpSRDpvppIqsaCFJAWX289fw2_Ocn6vJjnbDfXThvjdApoQTdFkLczheRhSavCBPUARSskj7suwOWzemw

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"creator" : "did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1",
2525
"created" : "2018-01-01T21:19:10Z",
2626
"nonce" : "c0ae1c8e-c7e7-469f-b252-86e6a0e7387e",
27-
"jws" : "eyJjcml0IjpbImI2NCJdLCJiNjQiOmZhbHNlLCJhbGciOiJSUzI1NiJ9..pZtcYsR_vEtm5ZLEGNJZPYuWQeD_drBG55gDrX4V-Zxe-R0ue90QzfLn9ZAheBrnWxQNobOsmc0wLBLnSNp5fMbmxHzaMuPadkMXgyqdgH6r13YHidLhtsg8OWGBU0nlFQe5NPztP8HJdgdTmK8ohQlx1pB7BQuB3-iY_cHO7PLuVJFplI616v7zINW46SNc6PE2cJ_O-dnehA_PaNCnUn7s-TfqTYC7LQ2N95XImBt9zW5DYE7NRY7ZZh1sBNaSnHweOYZay-W6u789J3zTFxgbl-hZGziFA4EOJoWUAdb1vCBzlBWasfmkD0LAxlv7UV0Fp3wG2laIFiTwgrm9eg"
27+
"jws" : "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..m-5V3caaBBVWldf9c83ve2gBfgDdZqVrBGQZl5flXwgskOTkBlEIODMkK0j203PeOIfHSYZUO5wj4bGCSHZ8ORaQWoJFX_znskHipBvH2wc4TBu4mgMIJefP14gl1kDGF6Vw_BtbP6EWpmm2dnhKztDo-X4XuUGpbyBJ-lVX_CGl0qftzPAZtabUEmc-dB911EfiNbslJ6qJYKd_r7D7scSVKnJtE0xXK4obrWJg2_tx-cD1KWtrJXf-wIXa43gdwlFcVLLrHvzglf-KkHezxI9Ee6RNcIP-YQNrsjNet4obRzZuwcQAJ8-pBwdF901AgDKAI0Q85cjy_LGbxqb0GA"
2828
}
2929
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"creator" : "did:sov:1yvXbmgPoUm4dl66D7KhyD#keys-1",
2525
"created" : "2018-01-01T21:19:10Z",
2626
"nonce" : "c0ae1c8e-c7e7-469f-b252-86e6a0e7387e",
27-
"jws" : "eyJjcml0IjpbImI2NCJdLCJiNjQiOmZhbHNlLCJhbGciOiJSUzI1NiJ9..pZtcYsR_vEtm5ZLEGNJZPYuWQeD_drBG55gDrX4V-Zxe-R0ue90QzfLn9ZAheBrnWxQNobOsmc0wLBLnSNp5fMbmxHzaMuPadkMXgyqdgH6r13YHidLhtsg8OWGBU0nlFQe5NPztP8HJdgdTmK8ohQlx1pB7BQuB3-iY_cHO7PLuVJFplI616v7zINW46SNc6PE2cJ_O-dnehA_PaNCnUn7s-TfqTYC7LQ2N95XImBt9zW5DYE7NRY7ZZh1sBNaSnHweOYZay-W6u789J3zTFxgbl-hZGziFA4EOJoWUAdb1vCBzlBWasfmkD0LAxlv7UV0Fp3wG2laIFiTwgrm9eg"
27+
"jws" : "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJSUzI1NiJ9..m-5V3caaBBVWldf9c83ve2gBfgDdZqVrBGQZl5flXwgskOTkBlEIODMkK0j203PeOIfHSYZUO5wj4bGCSHZ8ORaQWoJFX_znskHipBvH2wc4TBu4mgMIJefP14gl1kDGF6Vw_BtbP6EWpmm2dnhKztDo-X4XuUGpbyBJ-lVX_CGl0qftzPAZtabUEmc-dB911EfiNbslJ6qJYKd_r7D7scSVKnJtE0xXK4obrWJg2_tx-cD1KWtrJXf-wIXa43gdwlFcVLLrHvzglf-KkHezxI9Ee6RNcIP-YQNrsjNet4obRzZuwcQAJ8-pBwdF901AgDKAI0Q85cjy_LGbxqb0GA"
2828
}
2929
}

0 commit comments

Comments
 (0)