Skip to content
Snippets Groups Projects
Commit c82aa2d9 authored by Denis Sukhoroslov's avatar Denis Sukhoroslov
Browse files

Merge branch 'validationTestFix' into 'main'

enabled tests and Sd for service offering

See merge request gaia-x/data-infrastructure-federation-services/cat/fc-service!263
parents 9cf00e88 9c82cce6
No related branches found
No related tags found
No related merge requests found
......@@ -145,7 +145,7 @@ public class VerificationServiceImplTest {
schemaStore.initializeDefaultSchemas();
ContentAccessor content = getAccessor("VerificationService/syntax/serviceOffering2.jsonld");
verificationService.setTypes("https://w3id.org/gaia-x/core#Participant", "https://w3id.org/gaia-x/core#ServiceOffering");
VerificationResult vr = verificationService.verifySelfDescription(content, true, false, false);
VerificationResult vr = verificationService.verifySelfDescription(content, true, true, false);
verificationService.setTypes("http://w3id.org/gaia-x/participant#Participant", "http://w3id.org/gaia-x/service#ServiceOffering");
assertNotNull(vr);
assertTrue(vr instanceof VerificationResultOffering);
......@@ -154,7 +154,7 @@ public class VerificationServiceImplTest {
assertEquals("https://www.example.org/mySoftwareOffering", vro.getId());
assertEquals("http://gaiax.de", vro.getIssuer());
assertNotNull(vro.getClaims());
assertEquals(19, vro.getClaims().size()); //!!
assertEquals(21, vro.getClaims().size()); //!!
assertNull(vro.getValidators());
assertNull(vro.getValidatorDids());
assertEquals(Instant.parse("2022-10-19T18:48:09Z"), vro.getIssuedDateTime());
......@@ -165,7 +165,7 @@ public class VerificationServiceImplTest {
log.debug("validSyntax_ValidPerson");
schemaStore.addSchema(getAccessor("Schema-Tests/gax-test-ontology.ttl"));
ContentAccessor content = getAccessor("VerificationService/syntax/legalPerson1.jsonld");
VerificationResult vr = verificationService.verifySelfDescription(content, true, false, false);
VerificationResult vr = verificationService.verifySelfDescription(content, true, true, false);
assertNotNull(vr);
assertTrue(vr instanceof VerificationResultParticipant);
assertFalse(vr instanceof VerificationResultOffering);
......@@ -186,7 +186,7 @@ public class VerificationServiceImplTest {
schemaStore.initializeDefaultSchemas();
ContentAccessor content = getAccessor("VerificationService/syntax/legalPerson2.jsonld");
verificationService.setTypes("https://w3id.org/gaia-x/core#Participant", "https://w3id.org/gaia-x/core#ServiceOffering");
VerificationResult vr = verificationService.verifySelfDescription(content, true, false, false);
VerificationResult vr = verificationService.verifySelfDescription(content, true, true, false);
verificationService.setTypes("http://w3id.org/gaia-x/participant#Participant", "http://w3id.org/gaia-x/service#ServiceOffering");
assertNotNull(vr);
assertTrue(vr instanceof VerificationResultParticipant);
......
......@@ -26,23 +26,27 @@
},
"@id": "https://www.example.org/mySoftwareOffering",
"@type": "gax-trust-framework:ServiceOffering",
"gax-trust-framework:mySoftwareOffering": {
"@type": "gax-trust-framework:SoftwareOffering",
"gax-trust-framework:accessType": "access type",
"gax-trust-framework:formatType": "format type",
"gax-trust-framework:requestType": "request type"
"gax-core:providedBy": {
"@id": "gax-participant:Provider1"
},
"gax-trust-framework:providedBy": {
"gax-core:offeredBy": {
"@id": "gax-participant:Provider1"
},
"gax-trust-framework:dataAccountExport": {
"@type": "gax-trust-framework:DataAccountExport",
"gax-trust-framework:requestType": "API",
"gax-trust-framework:accessType": "digital",
"gax-trust-framework:formatType": "application/gzip"
},
"gax-trust-framework:termsAndConditions": {
"@type": "gax-core:TermsAndConditions",
"@type": "gax-trust-framework:TermsAndConditions",
"gax-trust-framework:content": {
"@type": "xsd:anyURI",
"@value": "http://example.org/tac"
},
"gax-trust-framework:hash": "1234"
},
"gax-trust-framework:policy": "list of policy",
"dcat:keyword": [
"Keyword1_1",
"Keyword1_2",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment