Skip to content

Commit 920453c

Browse files
ysrboatextor
ysrbo
authored and
atextor
committed
removed from unit tests an incorrect case
1 parent 21e3e6d commit 920453c

File tree

3 files changed

+111
-120
lines changed

3 files changed

+111
-120
lines changed

‎core/esmf-aspect-model-serializer/src/test/java/org/eclipse/esmf/aspectmodel/serializer/RdfModelCreatorVisitorTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public class RdfModelCreatorVisitorTest extends MetaModelVersions {
5959
"ASPECT_WITH_COLLECTION_WITH_ABSTRACT_ENTITY",
6060
"ASPECT_WITH_ABSTRACT_SINGLE_ENTITY",
6161
"ASPECT_WITH_ABSTRACT_PROPERTY",
62+
"ASPECT_WITH_MULTIPLE_ENTITIES_SAME_EXTEND",
6263
"MODEL_WITH_CYCLES",
6364
"MODEL_WITH_BROKEN_CYCLES",
6465
"MODEL_WITH_BLANK_AND_ADDITIONAL_NODES"

‎core/esmf-test-aspect-models/src/main/resources/valid/samm_1_0_0/org.eclipse.esmf.test/1.0.0/AspectWithMultipleEntitiesSameExtend.ttl‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
#
2-
# Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
3-
#
4-
# See the AUTHORS file(s) distributed with this work for additional
5-
# information regarding authorship.
6-
#
7-
# This Source Code Form is subject to the terms of the Mozilla Public
8-
# License, v. 2.0. If a copy of the MPL was not distributed with this
9-
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
10-
#
11-
# SPDX-License-Identifier: MPL-2.0
12-
#
13-
@prefix : <urn:samm:org.eclipse.esmf.test:1.0.0#> .
14-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0#> .
15-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:1.0.0#> .
16-
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
17-
18-
:AspectWithMultipleEntitiesSameExtend a samm:Aspect ;
19-
samm:name "TestAspect" ;
20-
samm:properties ( :testPropertyOne :testPropertyTwo ) ;
21-
samm:operations ( ) .
22-
23-
:testPropertyOne a samm:Property ;
24-
samm:name "testPropertyOne" ;
25-
samm:characteristic :testCharacteristicOne .
26-
27-
:testPropertyTwo a samm:Property ;
28-
samm:name "testPropertyTwo" ;
29-
samm:characteristic :testCharacteristicTwo .
30-
31-
:testCharacteristicOne a samm:Characteristic ;
32-
samm:name "testCharacteristicOne" ;
33-
samm:dataType :testEntityOne .
34-
35-
:testCharacteristicTwo a samm:Characteristic ;
36-
samm:name "testCharacteristicTwo" ;
37-
samm:dataType :testEntityTwo .
38-
39-
:testEntityOne a samm:Entity ;
40-
samm:name "TestEntityOne" ;
41-
samm:extends :AbstractTestEntity ;
42-
samm:properties ( ) .
43-
44-
:testEntityTwo a samm:Entity ;
45-
samm:name "TestEntityTwo" ;
46-
samm:extends :AbstractTestEntity ;
47-
samm:properties ( ) .
48-
49-
:testEntityThree a samm:Entity ;
50-
samm:name "TestEntityThree" ;
51-
samm:extends :AbstractSecondTestEntity ;
52-
samm:properties ( ) .
53-
54-
:AbstractTestEntity a samm:AbstractEntity ;
55-
samm:name "AbstractTestEntity" ;
56-
samm:properties ( ).
57-
58-
:AbstractSecondTestEntity a samm:AbstractEntity ;
59-
samm:name "AbstractSecondTestEntity" ;
60-
samm:properties ( ).
1+
#
2+
# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
3+
#
4+
# See the AUTHORS file(s) distributed with this work for additional
5+
# information regarding authorship.
6+
#
7+
# This Source Code Form is subject to the terms of the Mozilla Public
8+
# License, v. 2.0. If a copy of the MPL was not distributed with this
9+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
10+
#
11+
# SPDX-License-Identifier: MPL-2.0
12+
#
13+
@prefix : <urn:samm:org.eclipse.esmf.test:1.0.0#> .
14+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:1.0.0#> .
15+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:1.0.0#> .
16+
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
17+
18+
:AspectWithMultipleEntitiesSameExtend a samm:Aspect ;
19+
samm:name "TestAspect" ;
20+
samm:properties ( :testPropertyOne :testPropertyTwo ) ;
21+
samm:operations ( ) .
22+
23+
:testPropertyOne a samm:Property ;
24+
samm:name "testPropertyOne" ;
25+
samm:characteristic :testCharacteristicOne .
26+
27+
:testPropertyTwo a samm:Property ;
28+
samm:name "testPropertyTwo" ;
29+
samm:characteristic :testCharacteristicTwo .
30+
31+
:testCharacteristicOne a samm:Characteristic ;
32+
samm:name "testCharacteristicOne" ;
33+
samm:dataType :testEntityOne .
34+
35+
:testCharacteristicTwo a samm:Characteristic ;
36+
samm:name "testCharacteristicTwo" ;
37+
samm:dataType :testEntityTwo .
38+
39+
:testEntityOne a samm:Entity ;
40+
samm:name "TestEntityOne" ;
41+
samm:extends :AbstractTestEntity ;
42+
samm:properties ( ) .
43+
44+
:testEntityTwo a samm:Entity ;
45+
samm:name "TestEntityTwo" ;
46+
samm:extends :AbstractTestEntity ;
47+
samm:properties ( ) .
48+
49+
:testEntityThree a samm:Entity ;
50+
samm:name "TestEntityThree" ;
51+
samm:extends :AbstractSecondTestEntity ;
52+
samm:properties ( ) .
53+
54+
:AbstractTestEntity a samm:AbstractEntity ;
55+
samm:name "AbstractTestEntity" ;
56+
samm:properties ( ).
57+
58+
:AbstractSecondTestEntity a samm:AbstractEntity ;
59+
samm:name "AbstractSecondTestEntity" ;
60+
samm:properties ( ).

‎core/esmf-test-aspect-models/src/main/resources/valid/samm_2_0_0/org.eclipse.esmf.test/1.0.0/AspectWithMultipleEntitiesSameExtend.ttl‎

Lines changed: 50 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,50 @@
1-
#
2-
# Copyright (c) 2021 Robert Bosch Manufacturing Solutions GmbH
3-
#
4-
# See the AUTHORS file(s) distributed with this work for additional
5-
# information regarding authorship.
6-
#
7-
# This Source Code Form is subject to the terms of the Mozilla Public
8-
# License, v. 2.0. If a copy of the MPL was not distributed with this
9-
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
10-
#
11-
# SPDX-License-Identifier: MPL-2.0
12-
13-
@prefix : <urn:samm:org.eclipse.esmf.test:1.0.0#> .
14-
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
15-
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
16-
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
17-
18-
:AspectWithMultipleEntitiesSameExtend a samm:Aspect ;
19-
samm:name "TestAspect" ;
20-
samm:properties ( :testPropertyOne :testPropertyTwo ) ;
21-
samm:operations ( ) .
22-
23-
:testPropertyOne a samm:Property ;
24-
samm:name "testPropertyOne" ;
25-
samm:characteristic :testCharacteristicOne .
26-
27-
:testPropertyTwo a samm:Property ;
28-
samm:name "testPropertyTwo" ;
29-
samm:characteristic :testCharacteristicTwo .
30-
31-
:testCharacteristicOne a samm:Characteristic ;
32-
samm:name "testCharacteristicOne" ;
33-
samm:dataType :testEntityOne .
34-
35-
:testCharacteristicTwo a samm:Characteristic ;
36-
samm:name "testCharacteristicTwo" ;
37-
samm:dataType :testEntityTwo .
38-
39-
:testEntityOne a samm:Entity ;
40-
samm:name "TestEntityOne" ;
41-
samm:extends :AbstractTestEntity ;
42-
samm:properties ( ) .
43-
44-
:testEntityTwo a samm:Entity ;
45-
samm:name "TestEntityTwo" ;
46-
samm:extends :AbstractTestEntity ;
47-
samm:properties ( ) .
48-
49-
:testEntityThree a samm:Entity ;
50-
samm:name "TestEntityThree" ;
51-
samm:extends :AbstractSecondTestEntity ;
52-
samm:properties ( ) .
53-
54-
:AbstractTestEntity a samm:AbstractEntity ;
55-
samm:name "AbstractTestEntity" ;
56-
samm:properties ( ).
57-
58-
:AbstractSecondTestEntity a samm:AbstractEntity ;
59-
samm:name "AbstractSecondTestEntity" ;
60-
samm:properties ( ).
1+
#
2+
# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
3+
#
4+
# See the AUTHORS file(s) distributed with this work for additional
5+
# information regarding authorship.
6+
#
7+
# This Source Code Form is subject to the terms of the Mozilla Public
8+
# License, v. 2.0. If a copy of the MPL was not distributed with this
9+
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
10+
#
11+
# SPDX-License-Identifier: MPL-2.0
12+
13+
@prefix : <urn:samm:org.eclipse.esmf.test:1.0.0#> .
14+
@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.0.0#> .
15+
@prefix samm-c: <urn:samm:org.eclipse.esmf.samm:characteristic:2.0.0#> .
16+
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
17+
18+
:AspectWithMultipleEntitiesSameExtend a samm:Aspect ;
19+
samm:properties ( :testPropertyOne :testPropertyTwo ) ;
20+
samm:operations ( ) .
21+
22+
:testPropertyOne a samm:Property ;
23+
samm:characteristic :testCharacteristicOne .
24+
25+
:testPropertyTwo a samm:Property ;
26+
samm:characteristic :testCharacteristicTwo .
27+
28+
:testCharacteristicOne a samm:Characteristic ;
29+
samm:dataType :testEntityOne .
30+
31+
:testCharacteristicTwo a samm:Characteristic ;
32+
samm:dataType :testEntityTwo .
33+
34+
:testEntityOne a samm:Entity ;
35+
samm:extends :AbstractTestEntity ;
36+
samm:properties ( ) .
37+
38+
:testEntityTwo a samm:Entity ;
39+
samm:extends :AbstractTestEntity ;
40+
samm:properties ( ) .
41+
42+
:testEntityThree a samm:Entity ;
43+
samm:extends :AbstractSecondTestEntity ;
44+
samm:properties ( ) .
45+
46+
:AbstractTestEntity a samm:AbstractEntity ;
47+
samm:properties ( ).
48+
49+
:AbstractSecondTestEntity a samm:AbstractEntity ;
50+
samm:properties ( ).

0 commit comments

Comments
 (0)