From 6eb37935acbf9c225f51fa726cfd25227b0521f1 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 22 Jan 2025 08:05:47 +0100 Subject: [PATCH] roll back --- src/test/java/org/fiware/odrl/OdrlTest.java | 42 +++++++++---------- .../OpenPolicyAgentTestResource.java | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/test/java/org/fiware/odrl/OdrlTest.java b/src/test/java/org/fiware/odrl/OdrlTest.java index 55219b5..9a6b616 100644 --- a/src/test/java/org/fiware/odrl/OdrlTest.java +++ b/src/test/java/org/fiware/odrl/OdrlTest.java @@ -102,27 +102,27 @@ public static Stream validCombinations() { "PUT"), new MockEntity().id("urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6") .relatedParty(List.of(new RelatedParty().role("Owner").id("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2")))), -// Arguments.of( -// List.of("/examples/dome/1001/_1001.json"), -// getRequest("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2", -// "/productOffering/urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6", -// "PATCH"), -// new MockEntity().id("urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6") -// .relatedParty(List.of(new RelatedParty().role("Owner").id("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2")))), -// Arguments.of( -// List.of("/examples/dome/1002/_1002.json"), -// getRequest("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2", -// "/productOffering/urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6", -// "GET"), -// new MockEntity().id("urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6") -// .relatedParty(List.of(new RelatedParty().role("Owner").id("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2")))), -// Arguments.of( -// List.of("/examples/dome/1003/_1003.json"), -// getRequest("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2", -// "/urn:ngsi-ld:button:onboard", -// "GET"), -// new MockEntity().id("urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6") -// .relatedParty(List.of(new RelatedParty().role("Owner").id("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2")))), + Arguments.of( + List.of("/examples/dome/1001/_1001.json"), + getRequest("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2", + "/productOffering/urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6", + "PATCH"), + new MockEntity().id("urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6") + .relatedParty(List.of(new RelatedParty().role("Owner").id("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2")))), + Arguments.of( + List.of("/examples/dome/1002/_1002.json"), + getRequest("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2", + "/productOffering/urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6", + "GET"), + new MockEntity().id("urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6") + .relatedParty(List.of(new RelatedParty().role("Owner").id("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2")))), + Arguments.of( + List.of("/examples/dome/1003/_1003.json"), + getRequest("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2", + "/urn:ngsi-ld:button:onboard", + "GET"), + new MockEntity().id("urn:ngsi-ld:product-offering:62d4f929-d29d-4070-ae1f-9fe7dd1de5f6") + .relatedParty(List.of(new RelatedParty().role("Owner").id("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2")))), Arguments.of( List.of("/examples/dome/1003/_1003.json"), getRequest("urn:ngsi-ld:organization:0b03975e-7ded-4fbd-9c3b-a5d6550df7e2", diff --git a/src/test/java/org/fiware/odrl/resources/OpenPolicyAgentTestResource.java b/src/test/java/org/fiware/odrl/resources/OpenPolicyAgentTestResource.java index 2f0fca8..c46b8d1 100644 --- a/src/test/java/org/fiware/odrl/resources/OpenPolicyAgentTestResource.java +++ b/src/test/java/org/fiware/odrl/resources/OpenPolicyAgentTestResource.java @@ -21,7 +21,7 @@ public class OpenPolicyAgentTestResource implements QuarkusTestResourceLifecycle @Override public Map start() { - opaContainer = new GenericContainer("openpolicyagent/opa:0.64.1") + opaContainer = new GenericContainer("openpolicyagent/opa:0.63.0") .withReuse(false) .withCopyToContainer(MountableFile.forClasspathResource("opa.yaml"), "/opa.yaml") .withCommand("run", "--server", "-l", "debug", "-c", "/opa.yaml", "--addr", "localhost:8181")