From c228589e473c97d602c3ae1f5a43222572cdeef5 Mon Sep 17 00:00:00 2001 From: laura Date: Thu, 28 Sep 2023 19:25:10 +0200 Subject: [PATCH] fixed test UndocumentedModelElementInconsistencyTest --- .../api/models/tracelinks/InstanceLink.java | 2 +- .../core/common/util/SimilarityUtils.java | 2 +- .../ardoco/core/common/util/FilePrinter.java | 2 +- .../ConnectionStateImpl.java | 4 ++-- ...ssingTextForModelElementInconsistency.java | 6 ++--- ...cumentedModelElementInconsistencyTest.java | 22 +++++++------------ .../core/models/ModelExtractionStateImpl.java | 4 ++-- .../files/ConnectionStateFile.java | 4 ++-- .../tlrhelper/files/TLModelFile.java | 2 +- .../tlrhelper/files/TLSummaryFile.java | 4 ++-- 10 files changed, 23 insertions(+), 29 deletions(-) diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/InstanceLink.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/InstanceLink.java index 659da05a1..bba77480a 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/InstanceLink.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/api/models/tracelinks/InstanceLink.java @@ -111,7 +111,7 @@ public String toString() { typePositions.addAll(typeMapping.getMappingSentenceNo().castToCollection()); } return "InstanceMapping [ uid=" + entity.getId() + ", name=" + entity.getName() + // - ", as=" + String.join(", ", entity.getClass().getName()) + ", probability=" + getConfidence() + ", FOUND: " + // + ", as=" + String.join(", ", entity.getClass().getSimpleName()) + ", probability=" + getConfidence() + ", FOUND: " + // textualInstance.getName() + " : " + textualInstance.getType() + ", occurrences= " + // "NameVariants: " + names.size() + ": " + names + " sentences{" + Arrays.toString(namePositions.toArray()) + "}" + // ", TypeVariants: " + types.size() + ": " + types + "sentences{" + Arrays.toString(typePositions.toArray()) + "}" + "]"; diff --git a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/SimilarityUtils.java b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/SimilarityUtils.java index ccb65825b..268fc2a69 100644 --- a/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/SimilarityUtils.java +++ b/framework/common/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/SimilarityUtils.java @@ -117,7 +117,7 @@ public static boolean isRecommendedInstanceSimilarToEntity(RecommendedInstance r * @return true, if the {@link Word} and the type of the {@link Entity} are similar. */ public static boolean isWordSimilarToModelInstanceType(Word word, Entity entity) { - var type = entity.getClass().getName(); + var type = entity.getClass().getSimpleName(); return areWordsSimilar(type, word.getText()); } diff --git a/pipeline/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java b/pipeline/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java index 9742f86e5..94cbe60be 100644 --- a/pipeline/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java +++ b/pipeline/pipeline-core/src/main/java/edu/kit/kastel/mcse/ardoco/core/common/util/FilePrinter.java @@ -267,7 +267,7 @@ private static ImmutableList getInstancesFromModelState(ModelExtractio dataLines.add(new String[] { "UID", "Name", "Type" }); for (Entity entity : modelState.getEntities()) { - dataLines.add(new String[] { entity.getId(), entity.getName(), entity.getClass().getName()}); + dataLines.add(new String[] { entity.getId(), entity.getName(), entity.getClass().getSimpleName()}); } return dataLines.toImmutable(); diff --git a/stages/connection-generator/src/main/java/edu/kit/kastel/mcse/ardoco/core/connectiongenerator/ConnectionStateImpl.java b/stages/connection-generator/src/main/java/edu/kit/kastel/mcse/ardoco/core/connectiongenerator/ConnectionStateImpl.java index 718f64ede..772d481ec 100644 --- a/stages/connection-generator/src/main/java/edu/kit/kastel/mcse/ardoco/core/connectiongenerator/ConnectionStateImpl.java +++ b/stages/connection-generator/src/main/java/edu/kit/kastel/mcse/ardoco/core/connectiongenerator/ConnectionStateImpl.java @@ -60,7 +60,7 @@ public ImmutableList getInstanceLinksByName(String name) { */ @Override public ImmutableList getInstanceLinksByType(String type) { - return Lists.immutable.fromStream(instanceLinks.stream().filter(ilink -> ilink.getEntity().getClass().getName().equals(type))); + return Lists.immutable.fromStream(instanceLinks.stream().filter(ilink -> ilink.getEntity().getClass().getSimpleName().equals(type))); } @Override @@ -79,7 +79,7 @@ public ImmutableList getInstanceLinksByRecommendedInstance(Recomme public ImmutableList getInstanceLinks(String name, String type) { return Lists.immutable.fromStream(instanceLinks.stream() .filter(imapping -> imapping.getEntity().getNameParts().contains(name))// - .filter(imapping -> Arrays.stream(imapping.getEntity().getClass().getName().split(" ")).toList().contains(type))); + .filter(imapping -> Arrays.stream(imapping.getEntity().getClass().getSimpleName().split(" ")).toList().contains(type))); } /** diff --git a/stages/inconsistency-detection/src/main/java/edu/kit/kastel/mcse/ardoco/core/inconsistency/types/MissingTextForModelElementInconsistency.java b/stages/inconsistency-detection/src/main/java/edu/kit/kastel/mcse/ardoco/core/inconsistency/types/MissingTextForModelElementInconsistency.java index b5c45e341..659effcbb 100644 --- a/stages/inconsistency-detection/src/main/java/edu/kit/kastel/mcse/ardoco/core/inconsistency/types/MissingTextForModelElementInconsistency.java +++ b/stages/inconsistency-detection/src/main/java/edu/kit/kastel/mcse/ardoco/core/inconsistency/types/MissingTextForModelElementInconsistency.java @@ -22,7 +22,7 @@ public MissingTextForModelElementInconsistency(Entity entity) { @Override public String getReason() { - return String.format(Locale.US, "Model contains an Instance \"%s\" (type: \"%s\") that seems to be undocumented.", entity.getName(), entity.getClass().getName()); + return String.format(Locale.US, "Model contains an Instance \"%s\" (type: \"%s\") that seems to be undocumented.", entity.getName(), entity.getClass().getSimpleName()); } @Override @@ -53,7 +53,7 @@ public boolean equals(Object obj) { @Override public ImmutableCollection toFileOutput() { - String[] entry = { getType(), entity.getName(), entity.getClass().getName() }; + String[] entry = { getType(), entity.getName(), entity.getClass().getSimpleName() }; var list = Lists.mutable.empty(); list.add(entry); return list.toImmutable(); @@ -66,7 +66,7 @@ public String getEntityName() { @Override public String getEntityType() { - return entity.getClass().getName(); + return entity.getClass().getSimpleName(); } @Override diff --git a/stages/inconsistency-detection/src/test/java/edu/kit/kastel/mcse/ardoco/core/inconsistency/agents/UndocumentedModelElementInconsistencyTest.java b/stages/inconsistency-detection/src/test/java/edu/kit/kastel/mcse/ardoco/core/inconsistency/agents/UndocumentedModelElementInconsistencyTest.java index 052af150c..d3ac51253 100644 --- a/stages/inconsistency-detection/src/test/java/edu/kit/kastel/mcse/ardoco/core/inconsistency/agents/UndocumentedModelElementInconsistencyTest.java +++ b/stages/inconsistency-detection/src/test/java/edu/kit/kastel/mcse/ardoco/core/inconsistency/agents/UndocumentedModelElementInconsistencyTest.java @@ -51,25 +51,19 @@ void filterWithWhitelistTest() { @Test void modelInstanceHasTargetedTypeTest() { - MutableList exactTypes = Lists.mutable.of("BasicComponent", "CompositeComponent"); - MutableList shortenedType = Lists.mutable.of("Component"); + MutableList exactTypes = Lists.mutable.of("ArchitectureComponent"); Assertions.assertAll(// () -> Assertions.assertTrue(UndocumentedModelElementInconsistencyInformant.modelInstanceHasTargetedType(modelInstances.get(0), exactTypes), - "Instance 0 with 'exactTypes'"), () -> Assertions.assertTrue(UndocumentedModelElementInconsistencyInformant - .modelInstanceHasTargetedType(modelInstances.get(1), exactTypes), "Instance 1 with 'exactTypes'"), () -> Assertions.assertFalse( - UndocumentedModelElementInconsistencyInformant.modelInstanceHasTargetedType(modelInstances.get(2), exactTypes), + "Instance 0 with 'exactTypes'"), + () -> Assertions.assertTrue(UndocumentedModelElementInconsistencyInformant + .modelInstanceHasTargetedType(modelInstances.get(1), exactTypes), "Instance 1 with 'exactTypes'"), + () -> Assertions.assertFalse(UndocumentedModelElementInconsistencyInformant.modelInstanceHasTargetedType(modelInstances.get(2), exactTypes), "Instance 2 with 'exactTypes'"), () -> Assertions.assertTrue(UndocumentedModelElementInconsistencyInformant .modelInstanceHasTargetedType(modelInstances.get(3), exactTypes), "Instance 3 with 'exactTypes'"), - () -> Assertions.assertFalse(UndocumentedModelElementInconsistencyInformant.modelInstanceHasTargetedType(modelInstances.get(4), exactTypes), - "Instance 4 with 'types'"), () -> Assertions.assertTrue(UndocumentedModelElementInconsistencyInformant.modelInstanceHasTargetedType( - modelInstances.get(0), shortenedType), "Instance 0 with 'shortenedType'"), () -> Assertions.assertTrue( - UndocumentedModelElementInconsistencyInformant.modelInstanceHasTargetedType(modelInstances.get(1), shortenedType), - "Instance 1 with 'shortenedType'"), () -> Assertions.assertFalse(UndocumentedModelElementInconsistencyInformant - .modelInstanceHasTargetedType(modelInstances.get(2), shortenedType), "Instance 2 with 'shortenedType'"), - () -> Assertions.assertTrue(UndocumentedModelElementInconsistencyInformant.modelInstanceHasTargetedType(modelInstances.get(3), shortenedType), - "Instance 3 with 'shortenedType'"), () -> Assertions.assertTrue(UndocumentedModelElementInconsistencyInformant - .modelInstanceHasTargetedType(modelInstances.get(4), shortenedType), "Instance 4 with 'shortenedType'")); + () -> Assertions.assertTrue(UndocumentedModelElementInconsistencyInformant.modelInstanceHasTargetedType(modelInstances.get(4), exactTypes), + "Instance 4 with 'types'") + ); } } diff --git a/stages/model-provider/src/main/java/edu/kit/kastel/mcse/ardoco/core/models/ModelExtractionStateImpl.java b/stages/model-provider/src/main/java/edu/kit/kastel/mcse/ardoco/core/models/ModelExtractionStateImpl.java index efb945b16..3f25a24e4 100644 --- a/stages/model-provider/src/main/java/edu/kit/kastel/mcse/ardoco/core/models/ModelExtractionStateImpl.java +++ b/stages/model-provider/src/main/java/edu/kit/kastel/mcse/ardoco/core/models/ModelExtractionStateImpl.java @@ -59,7 +59,7 @@ public ModelExtractionStateImpl(String modelId, Metamodel metamodelType, Immutab */ private void collectTypesAndNames() { for (Entity i : entities) { - entityTypes.add(i.getClass().getName()); + entityTypes.add(i.getClass().getSimpleName()); names.addAll(Arrays.stream(i.getName().split(" ")).toList()); } } @@ -82,7 +82,7 @@ public Metamodel getMetamodel() { */ @Override public ImmutableList getEntitiesOfType(String type) { - return entities.select(i -> i.getClass().getName().equals(type)); + return entities.select(i -> i.getClass().getSimpleName().equals(type)); } /** diff --git a/tests/tests-misc/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/statehelper/files/ConnectionStateFile.java b/tests/tests-misc/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/statehelper/files/ConnectionStateFile.java index 2d885f4d2..37a6551a0 100644 --- a/tests/tests-misc/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/statehelper/files/ConnectionStateFile.java +++ b/tests/tests-misc/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/statehelper/files/ConnectionStateFile.java @@ -68,7 +68,7 @@ public static void write(Path targetFile, ArDoCoResult arDoCoResult, String mode builder.append(VALUE_SEPARATOR); builder.append(entity.getName()); builder.append(VALUE_SEPARATOR); - builder.append(entity.getClass().getName()); + builder.append(entity.getClass().getSimpleName()); builder.append(VALUE_SEPARATOR); builder.append(df.format(instanceLink.getConfidence())); @@ -142,7 +142,7 @@ public static boolean writeDiff(Path sourceFile, Path targetFile, Path diffFile, String uid = currentModelInstance.getId(); String modelName = currentModelInstance.getName(); - String modelType = currentModelInstance.getClass().getName(); + String modelType = currentModelInstance.getClass().getSimpleName(); String linkProbability = df.format(currentLink.getConfidence()); ImmutableList sentences = currentTextInstance.getSentenceNumbers().toSortedList().collect(no -> Integer.toString(no)).toImmutable(); String name = currentTextInstance.getName(); diff --git a/tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/tlrhelper/files/TLModelFile.java b/tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/tlrhelper/files/TLModelFile.java index 33c0d9d9d..1105f1801 100644 --- a/tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/tlrhelper/files/TLModelFile.java +++ b/tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/tlrhelper/files/TLModelFile.java @@ -50,7 +50,7 @@ public static void save(Path targetFile, Map dataMap) thr .append("]: \"") .append(model.getName()) .append("\" (") - .append(model.getClass().getName()) + .append(model.getClass().getSimpleName()) .append(") (") .append(String.join(", ", model.getNameParts())) .append(")") diff --git a/tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/tlrhelper/files/TLSummaryFile.java b/tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/tlrhelper/files/TLSummaryFile.java index 7c605bfcd..7d48c9872 100644 --- a/tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/tlrhelper/files/TLSummaryFile.java +++ b/tests/tests-tlr/src/test/java/edu/kit/kastel/mcse/ardoco/core/tests/integration/tlrhelper/files/TLSummaryFile.java @@ -131,14 +131,14 @@ private static String createFalseLinkOutput(ArDoCoResult data, Text text, TestLi } static String format(TestLink link, Text text, ModelExtractionState modelState) { - var model = modelState.getInstances().stream().filter(m -> m.getUid().equals(link.modelId())).findAny().orElse(null); + var model = modelState.getEntities().stream().filter(m -> m.getId().equals(link.modelId())).findAny().orElse(null); var sentence = text.getSentences().stream().filter(s -> s.getSentenceNumber() == link.sentenceNr()).findAny().orElse(null); if (model == null && sentence == null) { return null; } - var modelStr = model == null ? link.modelId() : "\"" + model.getFullName() + "\""; + var modelStr = model == null ? link.modelId() : "\"" + model.getName() + "\""; var sentenceStr = sentence == null ? String.valueOf(link.sentenceNr()) : "\"" + sentence.getText() + "\""; return String.format("%s ⇔ %s [%s,%s]", modelStr, sentenceStr, link.modelId(), link.sentenceNr());