From e39137f697fa50bc70ea5cca4a761be82105d563 Mon Sep 17 00:00:00 2001 From: Michael Wurster Date: Mon, 22 Mar 2021 13:16:53 +0100 Subject: [PATCH] Fix unit tests --- .../edmm/model/DeploymentModelTest.java | 2 +- .../templates/unit-tests/relations.yml | 16 +-------- .../unit-tests/relations_generated.yml | 36 +------------------ 3 files changed, 3 insertions(+), 51 deletions(-) diff --git a/edmm-core/src/test/java/io/github/edmm/model/DeploymentModelTest.java b/edmm-core/src/test/java/io/github/edmm/model/DeploymentModelTest.java index 6fa74f21..67164840 100644 --- a/edmm-core/src/test/java/io/github/edmm/model/DeploymentModelTest.java +++ b/edmm-core/src/test/java/io/github/edmm/model/DeploymentModelTest.java @@ -106,7 +106,7 @@ public void testResolveRelations() throws Exception { assertTrue(relation instanceof DependsOn); assertEquals("db", relation.getTarget()); assertEquals(0, relation.getProperties().size()); - assertEquals(6, relation.getOperations().size()); + assertEquals(1, relation.getOperations().size()); assertEquals(3, model.getTopology().vertexSet().size()); assertEquals(4, model.getTopology().edgeSet().size()); } diff --git a/edmm-core/src/test/resources/templates/unit-tests/relations.yml b/edmm-core/src/test/resources/templates/unit-tests/relations.yml index 9b132020..2cf1e2a3 100644 --- a/edmm-core/src/test/resources/templates/unit-tests/relations.yml +++ b/edmm-core/src/test/resources/templates/unit-tests/relations.yml @@ -28,14 +28,6 @@ components: component_types: base: extends: null - description: The base type - metadata: {} - operations: - create: ~ - configure: ~ - start: ~ - stop: ~ - delete: ~ compute: extends: base properties: @@ -51,14 +43,8 @@ component_types: relation_types: depends_on: extends: null - properties: {} operations: - pre_configure_source: ~ - pre_configure_target: ~ - post_configure_source: ~ - post_configure_target: ~ - target_changed: ~ - target_removed: ~ + post_configure_target: add.sh hosted_on: extends: depends_on connects_to: diff --git a/edmm-core/src/test/resources/templates/unit-tests/relations_generated.yml b/edmm-core/src/test/resources/templates/unit-tests/relations_generated.yml index 98236891..259082d9 100644 --- a/edmm-core/src/test/resources/templates/unit-tests/relations_generated.yml +++ b/edmm-core/src/test/resources/templates/unit-tests/relations_generated.yml @@ -29,26 +29,10 @@ metadata: relation_types: depends_on: operations: - pre_configure_source: - artifacts: - - cmd: null - pre_configure_target: - artifacts: - - cmd: null - target_removed: - artifacts: - - cmd: null - post_configure_source: - artifacts: - - cmd: null post_configure_target: artifacts: - - cmd: null - target_changed: - artifacts: - - cmd: null + - cmd: add.sh extends: null - properties: null hosted_on: extends: depends_on connects_to: @@ -69,25 +53,7 @@ component_types: software_component: extends: base base: - metadata: null - operations: - stop: - artifacts: - - cmd: null - start: - artifacts: - - cmd: null - create: - artifacts: - - cmd: null - configure: - artifacts: - - cmd: null - delete: - artifacts: - - cmd: null extends: null - description: The base type version: edm_1_0 properties: bar: