Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Commit

Permalink
fixing integration tests because new DDO changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaitor
aaitor committed Sep 3, 2020
1 parent 39be1bc commit c408d67
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
2 changes: 2 additions & 0 deletions src/test/java/io/keyko/nevermined/api/AccountsApiIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public void list() throws Exception {
@Test
public void balance() throws Exception {

neverminedAPI.getTokensAPI().request(BigInteger.ONE);

Balance balance = neverminedAPI.getAccountsAPI().balance(neverminedAPI.getMainAccount());
assertNotNull(balance);

Expand Down
20 changes: 10 additions & 10 deletions src/test/java/io/keyko/nevermined/models/DdoIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void testDDOServicesOrder() throws Exception {
DDO ddo= ddoFromJson.integrityBuilder(credentials);

Assert.assertEquals("metadata", ddo.services.get(0).type);
Assert.assertEquals("access", ddo.services.get(1).type);
Assert.assertEquals("provenance", ddo.services.get(1).type);

Assert.assertEquals(0, ddo.services.get(0).index);
Assert.assertEquals(1, ddo.services.get(1).index);
Expand All @@ -80,14 +80,14 @@ public void testAccessDatasetMetadata() throws Exception {
log.debug("testAccessDatasetMetadata");
DDO ddo = DDO.fromJSON(new TypeReference<DDO>() {}, ACCESS_DATASET_EXAMPLE_CONTENT);
SortedMap<String, String> checksums = ddo.generateChecksums();
assertEquals(2, checksums.size());
assertEquals("9ca5f006901cced5d5b02fd3691b12b619d6a083bb3fca39b8c90bd60f194cf9", checksums.get("0"));
assertEquals("4294cb191438237940fe389fee1dcb5a0806432ac92622d50375a01d3406fa62", checksums.get("1"));
assertEquals(4, checksums.size());
assertEquals("cee6bb798004f460b3dc4d5d96d7741c7be6615bb6ed43079b14cee5d9ffdbc9", checksums.get("0"));
assertEquals("e4ac07c241b4a113e1ad6ef046b8fdf61c5e2c6e6a1745d352f8f30ffa84d704", checksums.get("1"));

DID did = DID.builder(ddo.toJson(ddo.proof.checksum));
log.debug("Did generated from checksums: " + did.did);
assertEquals(64, did.getHash().length());
assertEquals("did:nv:138fccf336883ae6312c9b8b375745a90be369454080e90985fb3e314ab0df25", did.did);
assertEquals("did:nv:3b5607872397a527cd69e41743b07ddbeeb8aa865f3decd1fab4be679e6c6eef", did.did);

}

Expand All @@ -97,13 +97,13 @@ public void testAccessAlgorithmMetadata() throws Exception {
log.debug("testAccessAlgorithmMetadata");
DDO ddo = DDO.fromJSON(new TypeReference<DDO>() {}, ACCESS_ALGORITHM_EXAMPLE_CONTENT);
SortedMap<String, String> checksums = ddo.generateChecksums();
assertEquals(1, checksums.size());
assertEquals(4, checksums.size());
assertEquals("7db297971665c115f5d2665d1ac11846648eb4474053078dfca79ca531e6c7b1", checksums.get("0"));

DID did = DID.builder(ddo.toJson(ddo.proof.checksum));
log.debug("Did generated from checksums: " + did.did);
assertEquals(64, did.getHash().length());
assertEquals("did:nv:138fccf336883ae6312c9b8b375745a90be369454080e90985fb3e314ab0df25", did.did);
assertEquals("did:nv:072d545ec7a4937bcf95f69abc939a8386e0f7d2dd3900d2e1bd55fb78dfdf38", did.did);

}

Expand All @@ -115,7 +115,7 @@ public void testDDOComputingMetadata() throws Exception {
SortedMap<String, String> checksums = ddo.generateChecksums();
assertEquals(2, checksums.size());
assertEquals("574b45e304c190c293855548f19b02ad0c826aee4b76fb3b3c25b27d8317efd7", checksums.get("0"));
assertEquals("603317133c7949ea3ba57255dcdb2a44b3427aea6af3dd358a19a0c9ce4193d3", checksums.get("2"));
assertEquals("603317133c7949ea3ba57255dcdb2a44b3427aea6af3dd358a19a0c9ce4193d3", checksums.get("4"));

DID did = DID.builder(ddo.toJson(ddo.proof.checksum));
log.debug("Did generated from checksums: " + did.did);
Expand Down Expand Up @@ -158,7 +158,7 @@ public void testComputeWorkflowCoordinatorMetadata() throws Exception {
DID did = DID.builder(ddo.toJson(ddo.proof.checksum));
log.debug("Did generated from checksums: " + did.did);
assertEquals(64, did.getHash().length());
assertEquals("did:nv:138fccf336883ae6312c9b8b375745a90be369454080e90985fb3e314ab0df25", did.did);
assertEquals("did:nv:bd67293754f14420b3ffe7de97f085f723ffa33e57c54eb4b2cc64da599cf239", did.did);

}

Expand All @@ -174,7 +174,7 @@ public void testAccessWorkflowMetadata() throws Exception {
DID did = DID.builder(ddo.toJson(ddo.proof.checksum));
log.debug("Did generated from checksums: " + did.did);
assertEquals(64, did.getHash().length());
assertEquals("did:nv:138fccf336883ae6312c9b8b375745a90be369454080e90985fb3e314ab0df25", did.did);
assertEquals("did:nv:bd67293754f14420b3ffe7de97f085f723ffa33e57c54eb4b2cc64da599cf239", did.did);

}

Expand Down
28 changes: 14 additions & 14 deletions src/test/resources/application.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ provider.address="0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0"

# Contracts addresses

contract.SignCondition.address="0x053dc56D2C6A87FB6CEb1063E4c1629B8Cc67F82"
contract.HashLockCondition.address="0x7256EdE4Bd3D79a8Cc03a2A74849506F5C90c614"
contract.LockRewardCondition.address="0xBDB91cF0a8449a2848Ba6194eE45579E81B1A0F9"
contract.AccessSecretStoreCondition.address="0xFF3a12191A703939b1466eC1Fc7679AbbFf88545"
contract.EscrowReward.address="0x886dE2b3F8F27eEd43bA2FD4bC2AabDc14E0d9dD"
contract.EscrowAccessSecretStoreTemplate.address="0xB4d05b7D929dD241b79e06FF1AeA033159693931"
contract.NeverminedToken.address="0x49E1828E62c762Af53e3B7f09c63c4c7B25A8511"
contract.Dispenser.address="0x44fB2DC892550A93E3BF8D3614bDfFa3ffD3d984"
contract.DIDRegistry.address="0x001F24A49Fc0a3c4E28D3Bb4050C4C94a885Cb26"
contract.ConditionStoreManager.address="0x0C2c0a4d148e9724065ec91875Af52597CCa82E1"
contract.TemplateStoreManager.address="0xF92A9C860f329ddc4750368e8DbB80D054CD8F0f"
contract.AgreementStoreManager.address="0xf70542C3FD62e8050720F648b8c5Bd727d88D81A"
contract.ComputeExecutionCondition.address="0xF673Cd200CEa6FAB788979BD475cC595d5894767"
contract.EscrowComputeExecutionTemplate.address="0xcD6318Df0dB24E994783bFF2AB73d81F1533c499"
contract.SignCondition.address="0x9794678E588736ccecc92e623CA7ff3c8834a4C4"
contract.HashLockCondition.address="0x0418410AE85d009e3d04908f837fa5817a8227Ad"
contract.LockRewardCondition.address="0x2cd82B786608998a331FF1aaE67B4b38d804635b"
contract.AccessSecretStoreCondition.address="0xAd9D566d42bbC3EEC5b80681A2b2D249Fb9b5919"
contract.EscrowReward.address="0x3478ca461da0D123Bd19a36A0863D3633744cD3a"
contract.EscrowAccessSecretStoreTemplate.address="0x498496be73f0E58feA1897F87300FE8574292386"
contract.NeverminedToken.address="0xBDed9B415670E4D3e8A651df2EfDDC16FcEd873c"
contract.Dispenser.address="0xc7DfB63ABB7a00E7FF1114F0F968Ac022E1a344e"
contract.DIDRegistry.address="0x84EaD0389E92733971ca2835f3E905Aaf97Fec7f"
contract.ConditionStoreManager.address="0x2D545Ba3b2f9dF2775ff6f32a57b8CF599A8e351"
contract.TemplateStoreManager.address="0x448FED712F01Ff6d52E2283cF3C5772e43707ff5"
contract.AgreementStoreManager.address="0x644f256A0F4e44aB8fC8a109F02863A845bBa258"
contract.ComputeExecutionCondition.address="0x36e5E77868276C3514Fda3C9c85A7668200cFcfd"
contract.EscrowComputeExecutionTemplate.address="0x14d36b75B4744a4231fc51e29B5f0B3E9Ea25aDA"


consume.basePath = "/tmp"
Expand Down

0 comments on commit c408d67

Please sign in to comment.