From 03bfc086373223c690b7fcfc76d71e41d64dec42 Mon Sep 17 00:00:00 2001 From: Andreas Pfeil Date: Tue, 15 Apr 2025 13:20:31 +0200 Subject: [PATCH 1/8] refactor: rename internal field 'url' to 'urls' --- .../ro_crate/context/RoCrateMetadataContext.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java index f4c2dfc4..d916f7b7 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java @@ -31,7 +31,7 @@ public class RoCrateMetadataContext implements CrateMetadataContext { protected static final String DEFAULT_CONTEXT_LOCATION = "default_context/version1.1.json"; protected static JsonNode defaultContext = null; - protected final Set url = new HashSet<>(); + protected final Set urls = new HashSet<>(); protected final HashMap contextMap = new HashMap<>(); // we need to keep the ones that are no coming from url // for the final representation @@ -89,7 +89,7 @@ public ObjectNode getContextJsonEntity() { ArrayNode array = objectMapper.createArrayNode(); ObjectNode jsonNode = objectMapper.createObjectNode(); ObjectNode finalNode = objectMapper.createObjectNode(); - for (String e : url) { + for (String e : urls) { array.add(e); } for (Map.Entry s : other.entrySet()) { @@ -156,7 +156,7 @@ public boolean checkEntity(AbstractEntity entity) { @Override public void addToContextFromUrl(String url) { - this.url.add(url); + this.urls.add(url); ObjectMapper objectMapper = MyObjectMapper.getMapper(); @@ -208,7 +208,7 @@ public void deleteValuePairFromContext(String key) { @Override public void deleteUrlFromContext(String url) { - this.url.remove(url); + this.urls.remove(url); } } From 83f5d5110eb812b3b327937106c0d079a0a81ae3 Mon Sep 17 00:00:00 2001 From: Andreas Pfeil Date: Tue, 15 Apr 2025 13:32:38 +0200 Subject: [PATCH 2/8] feat: add getter for context pair values --- .../edu/kit/datamanager/ro_crate/Crate.java | 7 ++++ .../edu/kit/datamanager/ro_crate/RoCrate.java | 4 +++ .../context/CrateMetadataContext.java | 7 ++++ .../context/RoCrateMetadataContext.java | 6 ++++ .../ro_crate/context/ContextTest.java | 32 +++++++++++++++++-- .../ro_crate/crate/TestRemoveAddContext.java | 16 ++++++++++ .../ro-crate-metadata.json | 28 ++++++++++++++++ 7 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 src/test/resources/crates/extendedContextExample/ro-crate-metadata.json diff --git a/src/main/java/edu/kit/datamanager/ro_crate/Crate.java b/src/main/java/edu/kit/datamanager/ro_crate/Crate.java index d7fd8bd9..a0ac823d 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/Crate.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/Crate.java @@ -51,6 +51,13 @@ public interface Crate { void setMetadataContext(CrateMetadataContext metadataContext); + /** + * Get the value of a key from the metadata context. + * @param key the key to be searched + * @return the value of the key, null if not found + */ + String getMetadataContextValueOf(String key); + RootDataEntity getRootDataEntity(); void setRootDataEntity(RootDataEntity rootDataEntity); diff --git a/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java b/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java index 2e6db32b..8b31567e 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java @@ -62,6 +62,10 @@ public void setMetadataContext(CrateMetadataContext metadataContext) { this.metadataContext = metadataContext; } + public String getMetadataContextValueOf(String key) { + return this.metadataContext.getValueOf(key); + } + public ContextualEntity getJsonDescriptor() { return jsonDescriptor; } diff --git a/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java b/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java index ba203338..9834e460 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java @@ -22,6 +22,13 @@ public interface CrateMetadataContext { void addToContext(String key, String value); + /** + * Get the value of a key from the context. + * @param key the key to be searched + * @return the value of the key, null if not found + */ + String getValueOf(String key); + void deleteValuePairFromContext(String key); void deleteUrlFromContext(String url); diff --git a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java index d916f7b7..48497958 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java @@ -200,6 +200,12 @@ public void addToContext(String key, String value) { this.other.put(key, value); } + @Override + public String getValueOf(String key) { + return Optional.ofNullable(this.contextMap.get(key)) + .orElseGet(() -> this.other.get(key)); + } + @Override public void deleteValuePairFromContext(String key) { this.contextMap.remove(key); diff --git a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java index f00e9d33..f01c89d4 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java @@ -1,6 +1,7 @@ package edu.kit.datamanager.ro_crate.context; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -14,6 +15,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.io.IOException; import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -140,9 +142,9 @@ void deleteUrlTest() { void doubledContextUrlsTest() throws JsonProcessingException { String url = "www.example.com"; RoCrateMetadataContext context = new RoCrateMetadataContext(); - assertFalse(context.url.contains(url)); + assertFalse(context.urls.contains(url)); context.addToContextFromUrl(url); - assertTrue(context.url.contains(url)); + assertTrue(context.urls.contains(url)); RoCrateMetadataContext contextDoubled = new RoCrateMetadataContext(); contextDoubled.addToContextFromUrl(url); @@ -224,4 +226,30 @@ void testAbsoluteUrlType() { .build(); assertTrue(this.context.checkEntity(validEntity)); } + + @Test + void testSetDeleteGetPair() { + String key = "key"; + String value = "value"; + context.addToContext(key, value); + assertEquals(value, context.getValueOf(key)); + context.deleteValuePairFromContext(key); + assertNull(context.getValueOf(key)); + } + + @Test + void testReadDeleteGetPair() throws IOException { + final String crateManifestPath = "/crates/extendedContextExample/ro-crate-metadata.json"; + ContextTest.class.getResource(crateManifestPath).getPath(); + ObjectMapper objectMapper = MyObjectMapper.getMapper(); + JsonNode jsonNode = objectMapper.readTree(ContextTest.class.getResourceAsStream(crateManifestPath)); + this.context = new RoCrateMetadataContext(jsonNode.get("@context")); + String key = "custom"; + String value = "_:"; + assertEquals(value, context.getValueOf(key)); + context.deleteValuePairFromContext(key); + assertNull(context.getValueOf(key)); + context.addToContext(key, value); + assertEquals(value, context.getValueOf(key)); + } } diff --git a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java index f51d0351..653a0d98 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java @@ -1,5 +1,7 @@ package edu.kit.datamanager.ro_crate.crate; +import edu.kit.datamanager.ro_crate.reader.FolderReader; +import edu.kit.datamanager.ro_crate.reader.RoCrateReader; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.core.JsonProcessingException; @@ -7,6 +9,9 @@ import edu.kit.datamanager.ro_crate.HelpFunctions; import edu.kit.datamanager.ro_crate.RoCrate; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestRemoveAddContext { @Test void testAddRemoveValuePair() throws JsonProcessingException { @@ -30,4 +35,15 @@ void testAddRemoveUrl() throws JsonProcessingException { } + @Test + void testReadDeleteGetContextPair() { + String crateManifestPath = "/crates/extendedContextExample/"; + crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); + RoCrate crate = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); + String key = "custom"; + String value = "_:"; + assertEquals(value, crate.getMetadataContextValueOf(key)); + crate.deleteValuePairFromContext(key); + assertNull(crate.getMetadataContextValueOf(key)); + } } diff --git a/src/test/resources/crates/extendedContextExample/ro-crate-metadata.json b/src/test/resources/crates/extendedContextExample/ro-crate-metadata.json new file mode 100644 index 00000000..c9648594 --- /dev/null +++ b/src/test/resources/crates/extendedContextExample/ro-crate-metadata.json @@ -0,0 +1,28 @@ +{ + "@context": [ + "https://w3id.org/ro/crate/1.1/context", + { + "owl": "https://www.w3.org/TR/owl-ref/#", + "datacite": "http://datacite.org/schema/kernel-4#", + "xsd": "http://www.w3.org/2001/XMLSchema#", + "rdfs": "https://www.w3.org/2000/01/rdf-schema#", + "custom": "_:" + } + ], + "@graph": [ + { + "@id": "./", + "@type": "Dataset", + "name" : "minimal", + "description" : "minimal RO_crate", + "datePublished": "2024", + "license": {"@id": "https://creativecommons.org/licenses/by-nc-sa/3.0/au/"} + }, + { + "@type": "CreativeWork", + "@id": "ro-crate-metadata.json", + "conformsTo": {"@id": "https://w3id.org/ro/crate/1.1"}, + "about": {"@id": "./"} + } + ] +} \ No newline at end of file From 1786cdb9d49f28689c76b1e19158b1c493222d56 Mon Sep 17 00:00:00 2001 From: Andreas Pfeil Date: Tue, 15 Apr 2025 14:17:12 +0200 Subject: [PATCH 3/8] feat: add methods to retrieve immutable keys and pairs from metadata context --- .../edu/kit/datamanager/ro_crate/Crate.java | 13 +++++++ .../edu/kit/datamanager/ro_crate/RoCrate.java | 10 +++++ .../context/CrateMetadataContext.java | 15 ++++++++ .../context/RoCrateMetadataContext.java | 17 +++++++++ .../ro_crate/context/ContextTest.java | 38 ++++++++++++++++--- .../ro_crate/crate/TestRemoveAddContext.java | 32 +++++++++++++++- 6 files changed, 118 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/kit/datamanager/ro_crate/Crate.java b/src/main/java/edu/kit/datamanager/ro_crate/Crate.java index a0ac823d..aff1b6fe 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/Crate.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/Crate.java @@ -2,6 +2,7 @@ import java.io.File; import java.util.Collection; +import java.util.Map; import java.util.Optional; import java.util.Set; @@ -58,6 +59,18 @@ public interface Crate { */ String getMetadataContextValueOf(String key); + /** + * Get an immutable collection of the keys in the metadata context. + * @return the keys in the metadata context + */ + Set getMetadataContextKeys(); + + /** + * Get an immutable map of the context. + * @return an immutable map containing the context key-value pairs + */ + Map getMetadataContextPairs(); + RootDataEntity getRootDataEntity(); void setRootDataEntity(RootDataEntity rootDataEntity); diff --git a/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java b/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java index 8b31567e..6dde8e1c 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java @@ -66,6 +66,16 @@ public String getMetadataContextValueOf(String key) { return this.metadataContext.getValueOf(key); } + @Override + public Set getMetadataContextKeys() { + return this.metadataContext.getImmutableKeys(); + } + + @Override + public Map getMetadataContextPairs() { + return this.metadataContext.getImmutablePairs(); + } + public ContextualEntity getJsonDescriptor() { return jsonDescriptor; } diff --git a/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java b/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java index 9834e460..26183fad 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java @@ -4,6 +4,9 @@ import edu.kit.datamanager.ro_crate.entities.AbstractEntity; +import java.util.Map; +import java.util.Set; + /** * Interface for the metadata context. * Most often in an ROCrate this is the default context, @@ -29,6 +32,18 @@ public interface CrateMetadataContext { */ String getValueOf(String key); + /** + * Get an immutable collection of the keys in the metadata context. + * @return the keys in the metadata context + */ + Set getImmutableKeys(); + + /** + * Get an immutable map of the context. + * @return an immutable map containing the context key-value pairs + */ + Map getImmutablePairs(); + void deleteValuePairFromContext(String key); void deleteUrlFromContext(String url); diff --git a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java index 48497958..527c2dfd 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java @@ -206,6 +206,23 @@ public String getValueOf(String key) { .orElseGet(() -> this.other.get(key)); } + @Override + public Set getImmutableKeys() { + List merged = new ArrayList<>(); + merged.addAll(this.contextMap.keySet()); + merged.addAll(this.other.keySet()); + return Set.copyOf(merged); + } + + @Override + public Map getImmutablePairs() { + Map merged = new HashMap<>(); + merged.putAll(this.contextMap); + merged.putAll(this.other); + return Map.copyOf(merged); + } + + @Override public void deleteValuePairFromContext(String key) { this.contextMap.remove(key); diff --git a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java index f01c89d4..eb9a0ea9 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.util.List; +import java.util.Set; import static org.junit.jupiter.api.Assertions.*; @@ -239,11 +240,7 @@ void testSetDeleteGetPair() { @Test void testReadDeleteGetPair() throws IOException { - final String crateManifestPath = "/crates/extendedContextExample/ro-crate-metadata.json"; - ContextTest.class.getResource(crateManifestPath).getPath(); - ObjectMapper objectMapper = MyObjectMapper.getMapper(); - JsonNode jsonNode = objectMapper.readTree(ContextTest.class.getResourceAsStream(crateManifestPath)); - this.context = new RoCrateMetadataContext(jsonNode.get("@context")); + setupComplexContext(); String key = "custom"; String value = "_:"; assertEquals(value, context.getValueOf(key)); @@ -252,4 +249,35 @@ void testReadDeleteGetPair() throws IOException { context.addToContext(key, value); assertEquals(value, context.getValueOf(key)); } + + @Test + void testReadKeys() throws IOException { + setupComplexContext(); + var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); + var given = context.getImmutableKeys(); + for (String key : expected) { + assertTrue(given.contains(key), "Key " + key + " not found in the context"); + } + } + + @Test + void testReadPairs() throws IOException { + setupComplexContext(); + var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); + var given = context.getImmutablePairs(); + var keys = given.keySet(); + var values = given.values(); + for (String key : expected) { + assertTrue(keys.contains(key), "Key " + key + " not found in the context"); + values.forEach(s -> assertFalse(s.isEmpty(), "Value for key " + key + " is empty")); + } + } + + private void setupComplexContext() throws IOException { + final String crateManifestPath = "/crates/extendedContextExample/ro-crate-metadata.json"; + ContextTest.class.getResource(crateManifestPath).getPath(); + ObjectMapper objectMapper = MyObjectMapper.getMapper(); + JsonNode jsonNode = objectMapper.readTree(ContextTest.class.getResourceAsStream(crateManifestPath)); + this.context = new RoCrateMetadataContext(jsonNode.get("@context")); + } } diff --git a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java index 653a0d98..b5b4c267 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java @@ -9,8 +9,9 @@ import edu.kit.datamanager.ro_crate.HelpFunctions; import edu.kit.datamanager.ro_crate.RoCrate; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.*; public class TestRemoveAddContext { @Test @@ -46,4 +47,31 @@ void testReadDeleteGetContextPair() { crate.deleteValuePairFromContext(key); assertNull(crate.getMetadataContextValueOf(key)); } + + @Test + void testReadContextKeys() { + String crateManifestPath = "/crates/extendedContextExample/"; + crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); + RoCrate crate = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); + var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); + var given = crate.getMetadataContextKeys(); + for (String key : expected) { + assertTrue(given.contains(key), "Key " + key + " not found in the context"); + } + } + + @Test + void testReadContextPairs() { + String crateManifestPath = "/crates/extendedContextExample/"; + crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); + RoCrate crate = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); + var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); + var given = crate.getMetadataContextPairs(); + var keys = given.keySet(); + var values = given.values(); + for (String key : expected) { + assertTrue(keys.contains(key), "Key " + key + " not found in the context"); + values.forEach(s -> assertFalse(s.isEmpty(), "Value for key " + key + " is empty")); + } + } } From 6a940e868f9764f796ba639cb60f1c6418c1cf30 Mon Sep 17 00:00:00 2001 From: Andreas Pfeil Date: Tue, 15 Apr 2025 14:19:32 +0200 Subject: [PATCH 4/8] refactor: rename metadata context accessors to use "read" prefix to indicate (documented) immutability --- .../java/edu/kit/datamanager/ro_crate/Crate.java | 6 +++--- .../java/edu/kit/datamanager/ro_crate/RoCrate.java | 12 ++++++------ .../ro_crate/context/CrateMetadataContext.java | 6 +++--- .../ro_crate/context/RoCrateMetadataContext.java | 6 +++--- .../datamanager/ro_crate/context/ContextTest.java | 14 +++++++------- .../ro_crate/crate/TestRemoveAddContext.java | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/edu/kit/datamanager/ro_crate/Crate.java b/src/main/java/edu/kit/datamanager/ro_crate/Crate.java index aff1b6fe..8f838eff 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/Crate.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/Crate.java @@ -57,19 +57,19 @@ public interface Crate { * @param key the key to be searched * @return the value of the key, null if not found */ - String getMetadataContextValueOf(String key); + String readMetadataContextValueOf(String key); /** * Get an immutable collection of the keys in the metadata context. * @return the keys in the metadata context */ - Set getMetadataContextKeys(); + Set readMetadataContextKeys(); /** * Get an immutable map of the context. * @return an immutable map containing the context key-value pairs */ - Map getMetadataContextPairs(); + Map readMetadataContextPairs(); RootDataEntity getRootDataEntity(); diff --git a/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java b/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java index 6dde8e1c..06ae1f5b 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java @@ -62,18 +62,18 @@ public void setMetadataContext(CrateMetadataContext metadataContext) { this.metadataContext = metadataContext; } - public String getMetadataContextValueOf(String key) { - return this.metadataContext.getValueOf(key); + public String readMetadataContextValueOf(String key) { + return this.metadataContext.readValueOf(key); } @Override - public Set getMetadataContextKeys() { - return this.metadataContext.getImmutableKeys(); + public Set readMetadataContextKeys() { + return this.metadataContext.readKeys(); } @Override - public Map getMetadataContextPairs() { - return this.metadataContext.getImmutablePairs(); + public Map readMetadataContextPairs() { + return this.metadataContext.readPairs(); } public ContextualEntity getJsonDescriptor() { diff --git a/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java b/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java index 26183fad..c1c495ea 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java @@ -30,19 +30,19 @@ public interface CrateMetadataContext { * @param key the key to be searched * @return the value of the key, null if not found */ - String getValueOf(String key); + String readValueOf(String key); /** * Get an immutable collection of the keys in the metadata context. * @return the keys in the metadata context */ - Set getImmutableKeys(); + Set readKeys(); /** * Get an immutable map of the context. * @return an immutable map containing the context key-value pairs */ - Map getImmutablePairs(); + Map readPairs(); void deleteValuePairFromContext(String key); diff --git a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java index 527c2dfd..3f17bcef 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java @@ -201,13 +201,13 @@ public void addToContext(String key, String value) { } @Override - public String getValueOf(String key) { + public String readValueOf(String key) { return Optional.ofNullable(this.contextMap.get(key)) .orElseGet(() -> this.other.get(key)); } @Override - public Set getImmutableKeys() { + public Set readKeys() { List merged = new ArrayList<>(); merged.addAll(this.contextMap.keySet()); merged.addAll(this.other.keySet()); @@ -215,7 +215,7 @@ public Set getImmutableKeys() { } @Override - public Map getImmutablePairs() { + public Map readPairs() { Map merged = new HashMap<>(); merged.putAll(this.contextMap); merged.putAll(this.other); diff --git a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java index eb9a0ea9..2f08f6d3 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java @@ -233,9 +233,9 @@ void testSetDeleteGetPair() { String key = "key"; String value = "value"; context.addToContext(key, value); - assertEquals(value, context.getValueOf(key)); + assertEquals(value, context.readValueOf(key)); context.deleteValuePairFromContext(key); - assertNull(context.getValueOf(key)); + assertNull(context.readValueOf(key)); } @Test @@ -243,18 +243,18 @@ void testReadDeleteGetPair() throws IOException { setupComplexContext(); String key = "custom"; String value = "_:"; - assertEquals(value, context.getValueOf(key)); + assertEquals(value, context.readValueOf(key)); context.deleteValuePairFromContext(key); - assertNull(context.getValueOf(key)); + assertNull(context.readValueOf(key)); context.addToContext(key, value); - assertEquals(value, context.getValueOf(key)); + assertEquals(value, context.readValueOf(key)); } @Test void testReadKeys() throws IOException { setupComplexContext(); var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = context.getImmutableKeys(); + var given = context.readKeys(); for (String key : expected) { assertTrue(given.contains(key), "Key " + key + " not found in the context"); } @@ -264,7 +264,7 @@ void testReadKeys() throws IOException { void testReadPairs() throws IOException { setupComplexContext(); var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = context.getImmutablePairs(); + var given = context.readPairs(); var keys = given.keySet(); var values = given.values(); for (String key : expected) { diff --git a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java index b5b4c267..21b101d0 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java @@ -43,9 +43,9 @@ void testReadDeleteGetContextPair() { RoCrate crate = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); String key = "custom"; String value = "_:"; - assertEquals(value, crate.getMetadataContextValueOf(key)); + assertEquals(value, crate.readMetadataContextValueOf(key)); crate.deleteValuePairFromContext(key); - assertNull(crate.getMetadataContextValueOf(key)); + assertNull(crate.readMetadataContextValueOf(key)); } @Test @@ -54,7 +54,7 @@ void testReadContextKeys() { crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); RoCrate crate = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = crate.getMetadataContextKeys(); + var given = crate.readMetadataContextKeys(); for (String key : expected) { assertTrue(given.contains(key), "Key " + key + " not found in the context"); } @@ -66,7 +66,7 @@ void testReadContextPairs() { crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); RoCrate crate = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = crate.getMetadataContextPairs(); + var given = crate.readMetadataContextPairs(); var keys = given.keySet(); var values = given.values(); for (String key : expected) { From 8322b181bd2564a5d104fb90630afdda27be633b Mon Sep 17 00:00:00 2001 From: Andreas Pfeil Date: Tue, 15 Apr 2025 14:42:58 +0200 Subject: [PATCH 5/8] refactor: avoid repeated test preparation (reading crate with complex context) --- .../ro_crate/context/ContextTest.java | 34 ++++++++---------- .../ro_crate/crate/TestRemoveAddContext.java | 36 +++++++++---------- 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java index 2f08f6d3..e4a29b5f 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java @@ -24,11 +24,18 @@ public class ContextTest { RoCrateMetadataContext context; + RoCrateMetadataContext complexContext; @BeforeEach - void initContext() { + void initContext() throws IOException { // this will load the default context this.context = new RoCrateMetadataContext(); + + final String crateManifestPath = "/crates/extendedContextExample/ro-crate-metadata.json"; + ContextTest.class.getResource(crateManifestPath).getPath(); + ObjectMapper objectMapper = MyObjectMapper.getMapper(); + JsonNode jsonNode = objectMapper.readTree(ContextTest.class.getResourceAsStream(crateManifestPath)); + this.complexContext = new RoCrateMetadataContext(jsonNode.get("@context")); } @Test @@ -240,21 +247,19 @@ void testSetDeleteGetPair() { @Test void testReadDeleteGetPair() throws IOException { - setupComplexContext(); String key = "custom"; String value = "_:"; - assertEquals(value, context.readValueOf(key)); - context.deleteValuePairFromContext(key); - assertNull(context.readValueOf(key)); - context.addToContext(key, value); - assertEquals(value, context.readValueOf(key)); + assertEquals(value, this.complexContext.readValueOf(key)); + this.complexContext.deleteValuePairFromContext(key); + assertNull(this.complexContext.readValueOf(key)); + this.complexContext.addToContext(key, value); + assertEquals(value, this.complexContext.readValueOf(key)); } @Test void testReadKeys() throws IOException { - setupComplexContext(); var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = context.readKeys(); + var given = this.complexContext.readKeys(); for (String key : expected) { assertTrue(given.contains(key), "Key " + key + " not found in the context"); } @@ -262,9 +267,8 @@ void testReadKeys() throws IOException { @Test void testReadPairs() throws IOException { - setupComplexContext(); var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = context.readPairs(); + var given = this.complexContext.readPairs(); var keys = given.keySet(); var values = given.values(); for (String key : expected) { @@ -272,12 +276,4 @@ void testReadPairs() throws IOException { values.forEach(s -> assertFalse(s.isEmpty(), "Value for key " + key + " is empty")); } } - - private void setupComplexContext() throws IOException { - final String crateManifestPath = "/crates/extendedContextExample/ro-crate-metadata.json"; - ContextTest.class.getResource(crateManifestPath).getPath(); - ObjectMapper objectMapper = MyObjectMapper.getMapper(); - JsonNode jsonNode = objectMapper.readTree(ContextTest.class.getResourceAsStream(crateManifestPath)); - this.context = new RoCrateMetadataContext(jsonNode.get("@context")); - } } diff --git a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java index 21b101d0..df58e76a 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java @@ -2,18 +2,27 @@ import edu.kit.datamanager.ro_crate.reader.FolderReader; import edu.kit.datamanager.ro_crate.reader.RoCrateReader; -import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.core.JsonProcessingException; - import edu.kit.datamanager.ro_crate.HelpFunctions; import edu.kit.datamanager.ro_crate.RoCrate; +import com.fasterxml.jackson.core.JsonProcessingException; + import java.util.Set; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; public class TestRemoveAddContext { + private RoCrate crateWithComplexContext; + + @BeforeEach + void setup() { + String crateManifestPath = "/crates/extendedContextExample/"; + crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); + this.crateWithComplexContext = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); + } + @Test void testAddRemoveValuePair() throws JsonProcessingException { RoCrate crate = new RoCrate.RoCrateBuilder().addValuePairToContext("key", "value").build(); @@ -38,23 +47,17 @@ void testAddRemoveUrl() throws JsonProcessingException { @Test void testReadDeleteGetContextPair() { - String crateManifestPath = "/crates/extendedContextExample/"; - crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); - RoCrate crate = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); String key = "custom"; String value = "_:"; - assertEquals(value, crate.readMetadataContextValueOf(key)); - crate.deleteValuePairFromContext(key); - assertNull(crate.readMetadataContextValueOf(key)); + assertEquals(value, this.crateWithComplexContext.readMetadataContextValueOf(key)); + this.crateWithComplexContext.deleteValuePairFromContext(key); + assertNull(this.crateWithComplexContext.readMetadataContextValueOf(key)); } @Test void testReadContextKeys() { - String crateManifestPath = "/crates/extendedContextExample/"; - crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); - RoCrate crate = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = crate.readMetadataContextKeys(); + var given = this.crateWithComplexContext.readMetadataContextKeys(); for (String key : expected) { assertTrue(given.contains(key), "Key " + key + " not found in the context"); } @@ -62,11 +65,8 @@ void testReadContextKeys() { @Test void testReadContextPairs() { - String crateManifestPath = "/crates/extendedContextExample/"; - crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); - RoCrate crate = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = crate.readMetadataContextPairs(); + var given = this.crateWithComplexContext.readMetadataContextPairs(); var keys = given.keySet(); var values = given.values(); for (String key : expected) { From be0aaeb633be1c33c174d59fb8bba19f84d43287 Mon Sep 17 00:00:00 2001 From: Andreas Pfeil Date: Tue, 15 Apr 2025 14:44:58 +0200 Subject: [PATCH 6/8] refactor: satisfy linter warnings --- .../kit/datamanager/ro_crate/context/ContextTest.java | 10 ++++------ .../ro_crate/crate/TestRemoveAddContext.java | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java index e4a29b5f..a18a0ab2 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java @@ -1,6 +1,5 @@ package edu.kit.datamanager.ro_crate.context; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -32,7 +31,6 @@ void initContext() throws IOException { this.context = new RoCrateMetadataContext(); final String crateManifestPath = "/crates/extendedContextExample/ro-crate-metadata.json"; - ContextTest.class.getResource(crateManifestPath).getPath(); ObjectMapper objectMapper = MyObjectMapper.getMapper(); JsonNode jsonNode = objectMapper.readTree(ContextTest.class.getResourceAsStream(crateManifestPath)); this.complexContext = new RoCrateMetadataContext(jsonNode.get("@context")); @@ -147,7 +145,7 @@ void deleteUrlTest() { } @Test - void doubledContextUrlsTest() throws JsonProcessingException { + void doubledContextUrlsTest() { String url = "www.example.com"; RoCrateMetadataContext context = new RoCrateMetadataContext(); assertFalse(context.urls.contains(url)); @@ -246,7 +244,7 @@ void testSetDeleteGetPair() { } @Test - void testReadDeleteGetPair() throws IOException { + void testReadDeleteGetPair() { String key = "custom"; String value = "_:"; assertEquals(value, this.complexContext.readValueOf(key)); @@ -257,7 +255,7 @@ void testReadDeleteGetPair() throws IOException { } @Test - void testReadKeys() throws IOException { + void testReadKeys() { var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); var given = this.complexContext.readKeys(); for (String key : expected) { @@ -266,7 +264,7 @@ void testReadKeys() throws IOException { } @Test - void testReadPairs() throws IOException { + void testReadPairs() { var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); var given = this.complexContext.readPairs(); var keys = given.keySet(); diff --git a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java index df58e76a..fa455c12 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import java.util.Objects; import java.util.Set; import org.junit.jupiter.api.BeforeEach; @@ -19,7 +20,7 @@ public class TestRemoveAddContext { @BeforeEach void setup() { String crateManifestPath = "/crates/extendedContextExample/"; - crateManifestPath = TestRemoveAddContext.class.getResource(crateManifestPath).getPath(); + crateManifestPath = Objects.requireNonNull(TestRemoveAddContext.class.getResource(crateManifestPath)).getPath(); this.crateWithComplexContext = new RoCrateReader(new FolderReader()).readCrate(crateManifestPath); } From d5af790f606560c57647c069c3d47b1374f53806 Mon Sep 17 00:00:00 2001 From: Andreas Pfeil Date: Tue, 15 Apr 2025 15:02:44 +0200 Subject: [PATCH 7/8] test: verify immutability of views on the context --- .../edu/kit/datamanager/ro_crate/context/ContextTest.java | 4 ++++ .../kit/datamanager/ro_crate/crate/TestRemoveAddContext.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java index a18a0ab2..19074836 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java @@ -261,6 +261,8 @@ void testReadKeys() { for (String key : expected) { assertTrue(given.contains(key), "Key " + key + " not found in the context"); } + // prove immutability + assertThrows(UnsupportedOperationException.class, () -> given.add("newKey")); } @Test @@ -273,5 +275,7 @@ void testReadPairs() { assertTrue(keys.contains(key), "Key " + key + " not found in the context"); values.forEach(s -> assertFalse(s.isEmpty(), "Value for key " + key + " is empty")); } + // prove immutability + assertThrows(UnsupportedOperationException.class, () -> given.put("newKey", "newValue")); } } diff --git a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java index fa455c12..f6b79c5e 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java @@ -62,6 +62,8 @@ void testReadContextKeys() { for (String key : expected) { assertTrue(given.contains(key), "Key " + key + " not found in the context"); } + // prove immutability + assertThrows(UnsupportedOperationException.class, () -> given.add("newKey")); } @Test @@ -74,5 +76,7 @@ void testReadContextPairs() { assertTrue(keys.contains(key), "Key " + key + " not found in the context"); values.forEach(s -> assertFalse(s.isEmpty(), "Value for key " + key + " is empty")); } + // prove immutability + assertThrows(UnsupportedOperationException.class, () -> given.put("newKey", "newValue")); } } From 597568d5645ed0531ac4f3799efd292977672ae6 Mon Sep 17 00:00:00 2001 From: Andreas Pfeil Date: Tue, 15 Apr 2025 15:23:53 +0200 Subject: [PATCH 8/8] refactor: rename context accessors to use "get" prefix for consistency --- .../java/edu/kit/datamanager/ro_crate/Crate.java | 6 +++--- .../java/edu/kit/datamanager/ro_crate/RoCrate.java | 12 ++++++------ .../ro_crate/context/CrateMetadataContext.java | 6 +++--- .../ro_crate/context/RoCrateMetadataContext.java | 6 +++--- .../datamanager/ro_crate/context/ContextTest.java | 14 +++++++------- .../ro_crate/crate/TestRemoveAddContext.java | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/edu/kit/datamanager/ro_crate/Crate.java b/src/main/java/edu/kit/datamanager/ro_crate/Crate.java index 8f838eff..aff1b6fe 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/Crate.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/Crate.java @@ -57,19 +57,19 @@ public interface Crate { * @param key the key to be searched * @return the value of the key, null if not found */ - String readMetadataContextValueOf(String key); + String getMetadataContextValueOf(String key); /** * Get an immutable collection of the keys in the metadata context. * @return the keys in the metadata context */ - Set readMetadataContextKeys(); + Set getMetadataContextKeys(); /** * Get an immutable map of the context. * @return an immutable map containing the context key-value pairs */ - Map readMetadataContextPairs(); + Map getMetadataContextPairs(); RootDataEntity getRootDataEntity(); diff --git a/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java b/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java index 06ae1f5b..c3f68a0f 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/RoCrate.java @@ -62,18 +62,18 @@ public void setMetadataContext(CrateMetadataContext metadataContext) { this.metadataContext = metadataContext; } - public String readMetadataContextValueOf(String key) { - return this.metadataContext.readValueOf(key); + public String getMetadataContextValueOf(String key) { + return this.metadataContext.getValueOf(key); } @Override - public Set readMetadataContextKeys() { - return this.metadataContext.readKeys(); + public Set getMetadataContextKeys() { + return this.metadataContext.getKeys(); } @Override - public Map readMetadataContextPairs() { - return this.metadataContext.readPairs(); + public Map getMetadataContextPairs() { + return this.metadataContext.getPairs(); } public ContextualEntity getJsonDescriptor() { diff --git a/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java b/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java index c1c495ea..dfe6548e 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/context/CrateMetadataContext.java @@ -30,19 +30,19 @@ public interface CrateMetadataContext { * @param key the key to be searched * @return the value of the key, null if not found */ - String readValueOf(String key); + String getValueOf(String key); /** * Get an immutable collection of the keys in the metadata context. * @return the keys in the metadata context */ - Set readKeys(); + Set getKeys(); /** * Get an immutable map of the context. * @return an immutable map containing the context key-value pairs */ - Map readPairs(); + Map getPairs(); void deleteValuePairFromContext(String key); diff --git a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java index 3f17bcef..731a4c1a 100644 --- a/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java +++ b/src/main/java/edu/kit/datamanager/ro_crate/context/RoCrateMetadataContext.java @@ -201,13 +201,13 @@ public void addToContext(String key, String value) { } @Override - public String readValueOf(String key) { + public String getValueOf(String key) { return Optional.ofNullable(this.contextMap.get(key)) .orElseGet(() -> this.other.get(key)); } @Override - public Set readKeys() { + public Set getKeys() { List merged = new ArrayList<>(); merged.addAll(this.contextMap.keySet()); merged.addAll(this.other.keySet()); @@ -215,7 +215,7 @@ public Set readKeys() { } @Override - public Map readPairs() { + public Map getPairs() { Map merged = new HashMap<>(); merged.putAll(this.contextMap); merged.putAll(this.other); diff --git a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java index 19074836..4995f272 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/context/ContextTest.java @@ -238,26 +238,26 @@ void testSetDeleteGetPair() { String key = "key"; String value = "value"; context.addToContext(key, value); - assertEquals(value, context.readValueOf(key)); + assertEquals(value, context.getValueOf(key)); context.deleteValuePairFromContext(key); - assertNull(context.readValueOf(key)); + assertNull(context.getValueOf(key)); } @Test void testReadDeleteGetPair() { String key = "custom"; String value = "_:"; - assertEquals(value, this.complexContext.readValueOf(key)); + assertEquals(value, this.complexContext.getValueOf(key)); this.complexContext.deleteValuePairFromContext(key); - assertNull(this.complexContext.readValueOf(key)); + assertNull(this.complexContext.getValueOf(key)); this.complexContext.addToContext(key, value); - assertEquals(value, this.complexContext.readValueOf(key)); + assertEquals(value, this.complexContext.getValueOf(key)); } @Test void testReadKeys() { var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = this.complexContext.readKeys(); + var given = this.complexContext.getKeys(); for (String key : expected) { assertTrue(given.contains(key), "Key " + key + " not found in the context"); } @@ -268,7 +268,7 @@ void testReadKeys() { @Test void testReadPairs() { var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = this.complexContext.readPairs(); + var given = this.complexContext.getPairs(); var keys = given.keySet(); var values = given.values(); for (String key : expected) { diff --git a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java index f6b79c5e..8f008510 100644 --- a/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java +++ b/src/test/java/edu/kit/datamanager/ro_crate/crate/TestRemoveAddContext.java @@ -50,15 +50,15 @@ void testAddRemoveUrl() throws JsonProcessingException { void testReadDeleteGetContextPair() { String key = "custom"; String value = "_:"; - assertEquals(value, this.crateWithComplexContext.readMetadataContextValueOf(key)); + assertEquals(value, this.crateWithComplexContext.getMetadataContextValueOf(key)); this.crateWithComplexContext.deleteValuePairFromContext(key); - assertNull(this.crateWithComplexContext.readMetadataContextValueOf(key)); + assertNull(this.crateWithComplexContext.getMetadataContextValueOf(key)); } @Test void testReadContextKeys() { var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = this.crateWithComplexContext.readMetadataContextKeys(); + var given = this.crateWithComplexContext.getMetadataContextKeys(); for (String key : expected) { assertTrue(given.contains(key), "Key " + key + " not found in the context"); } @@ -69,7 +69,7 @@ void testReadContextKeys() { @Test void testReadContextPairs() { var expected = Set.of("custom", "owl", "datacite", "xsd", "rdfs"); - var given = this.crateWithComplexContext.readMetadataContextPairs(); + var given = this.crateWithComplexContext.getMetadataContextPairs(); var keys = given.keySet(); var values = given.values(); for (String key : expected) {