Skip to content

Commit 1156c98

Browse files
authored
Merge pull request #19 from ATL-Research/add-scripts
Add correctness tester scripts
2 parents bf142c9 + 9b00dfb commit 1156c98

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+575
-128
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@
55
build/
66
bin/
77

8-
.vscode/
8+
.vscode/
9+
10+
output/
11+
reports/

metamodels/Class.ecore

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
<?xml version="1.0" encoding="ASCII"?>
22
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
3-
<ecore:EPackage name="PrimitiveTypes">
4-
<eClassifiers xsi:type="ecore:EDataType" name="Boolean"/>
5-
<eClassifiers xsi:type="ecore:EDataType" name="Integer"/>
6-
<eClassifiers xsi:type="ecore:EDataType" name="String"/>
7-
</ecore:EPackage>
8-
<ecore:EPackage name="Class">
3+
<ecore:EPackage name="class_" nsURI="Class" nsPrefix="class_">
94
<eClassifiers xsi:type="ecore:EClass" name="NamedElt" abstract="true">
10-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1" eType="/0/String"/>
5+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
116
</eClassifiers>
12-
<eClassifiers xsi:type="ecore:EClass" name="Classifier" abstract="true" eSuperTypes="/1/NamedElt"/>
13-
<eClassifiers xsi:type="ecore:EClass" name="DataType" eSuperTypes="/1/Classifier"/>
14-
<eClassifiers xsi:type="ecore:EClass" name="Class" eSuperTypes="/1/Classifier">
15-
<eStructuralFeatures xsi:type="ecore:EReference" name="attr" upperBound="-1" eType="/1/Attribute" containment="true" eOpposite="/1/Attribute/owner"/>
7+
<eClassifiers xsi:type="ecore:EClass" name="Classifier" abstract="true" eSuperTypes="#//NamedElt"/>
8+
<eClassifiers xsi:type="ecore:EClass" name="DataType" eSuperTypes="#//Classifier"/>
9+
<eClassifiers xsi:type="ecore:EClass" name="Class" eSuperTypes="#//Classifier">
10+
<eStructuralFeatures xsi:type="ecore:EReference" name="attr" upperBound="-1" eType="#//Attribute" containment="true" eOpposite="#//Attribute/owner"/>
1611
</eClassifiers>
17-
<eClassifiers xsi:type="ecore:EClass" name="Attribute" eSuperTypes="/1/NamedElt">
18-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="multiValued" ordered="false" lowerBound="1" eType="/0/Boolean"/>
19-
<eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/1/Classifier"/>
20-
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" ordered="false" lowerBound="1" eType="/1/Class" eOpposite="/1/Class/attr"/>
12+
<eClassifiers xsi:type="ecore:EClass" name="Attribute" eSuperTypes="#//NamedElt">
13+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="multiValued" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
14+
<eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="#//Classifier"/>
15+
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" ordered="false" lowerBound="1" eType="#//Class" eOpposite="#//Class/attr"/>
2116
</eClassifiers>
2217
</ecore:EPackage>
2318
</xmi:XMI>

metamodels/Relational.ecore

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="ASCII"?>
22
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
3-
<ecore:EPackage name="Relational">
3+
<ecore:EPackage name="relational_" nsURI="Relational" nsPrefix="relational_" >
44
<eClassifiers xsi:type="ecore:EClass" name="Named" abstract="true">
5-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1" eType="/1/String"/>
5+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
66
</eClassifiers>
77
<eClassifiers xsi:type="ecore:EClass" name="Table" eSuperTypes="/0/Named">
88
<eStructuralFeatures xsi:type="ecore:EReference" name="col" upperBound="-1" eType="/0/Column" containment="true" eOpposite="/0/Column/owner"/>
@@ -15,9 +15,4 @@
1515
</eClassifiers>
1616
<eClassifiers xsi:type="ecore:EClass" name="Type" eSuperTypes="/0/Named"/>
1717
</ecore:EPackage>
18-
<ecore:EPackage name="PrimitiveTypes">
19-
<eClassifiers xsi:type="ecore:EDataType" name="Boolean"/>
20-
<eClassifiers xsi:type="ecore:EDataType" name="Integer"/>
21-
<eClassifiers xsi:type="ecore:EDataType" name="String"/>
22-
</ecore:EPackage>
2318
</xmi:XMI>

models/Sample.xmi

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="ASCII"?>
22
<changes:ModelChangeSet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:changes="http://nmf.codeplex.com/changes" xmlns:class_="Class" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
33
<changes xsi:type="changes:AttributePropertyChange" newValue="Member" oldValue="Person">
4-
<affectedElement href="../../models/SampleClass.xmi#/1"/>
4+
<affectedElement href="../../models/correctness1/class.xmi#/1"/>
55
<feature xsi:type="ecore:EAttribute" href="Class#//NamedElt/name"/>
66
</changes>
77
<changes xsi:type="changes:AttributePropertyChange" oldValue="Family">
8-
<affectedElement href="../../models/SampleClass.xmi#/0"/>
8+
<affectedElement href="../../models/correctness1/class.xmi#/0"/>
99
<feature xsi:type="ecore:EAttribute" href="Class#//NamedElt/name"/>
1010
</changes>
1111
<changes xsi:type="changes:AttributePropertyChange" newValue="true" oldValue="false">
12-
<affectedElement href="../../models/SampleClass.xmi#/1/@attr.0"/>
12+
<affectedElement href="../../models/correctness1/class.xmi#/1/@attr.0"/>
1313
<feature xsi:type="ecore:EAttribute" href="Class#//Attribute/multiValued"/>
1414
</changes>
1515
<changes xsi:type="changes:CompositionCollectionInsertion">
16-
<affectedElement href="../../models/SampleClass.xmi#/1"/>
16+
<affectedElement href="../../models/correctness1/class.xmi#/1"/>
1717
<feature xsi:type="ecore:EReference" href="Class#//Class/attr"/>
1818
<addedElement xsi:type="class_:Attribute" name="newAttribute" multiValued="false"/>
1919
</changes>

models/correctness1/class.xmi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns="Class">
3+
<Class name="Family">
4+
<attr name="name" type="/2"/>
5+
<attr name="members" multiValued="true" type="/1"/>
6+
</Class>
7+
<Class name="Person">
8+
<attr name="firstName" type="/2"/>
9+
<attr name="closestFriend" type="/1"/>
10+
<attr name="emailAddresses" multiValued="true" type="/2"/>
11+
</Class>
12+
<DataType name="String"/>
13+
<DataType name="Integer"/>
14+
</xmi:XMI>

models/correctness2/change.xmi

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="ASCII"?>
2+
<changes:ModelChangeSet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:changes="http://nmf.codeplex.com/changes" xmlns:class_="Class" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
3+
<changes xsi:type="changes:AttributePropertyChange" newValue="Member" oldValue="Person">
4+
<affectedElement href="../../models/correctness2/class.xmi#/1"/>
5+
<feature xsi:type="ecore:EAttribute" href="Class#//NamedElt/name"/>
6+
</changes>
7+
<changes xsi:type="changes:AttributePropertyChange" oldValue="Family">
8+
<affectedElement href="../../models/correctness2/class.xmi#/0"/>
9+
<feature xsi:type="ecore:EAttribute" href="Class#//NamedElt/name"/>
10+
</changes>
11+
<changes xsi:type="changes:AttributePropertyChange" newValue="true" oldValue="false">
12+
<affectedElement href="../../models/correctness2/class.xmi#/1/@attr.0"/>
13+
<feature xsi:type="ecore:EAttribute" href="Class#//Attribute/multiValued"/>
14+
</changes>
15+
<changes xsi:type="changes:CompositionCollectionInsertion">
16+
<affectedElement href="../../models/correctness2/class.xmi#/1"/>
17+
<feature xsi:type="ecore:EReference" href="Class#//Class/attr"/>
18+
<addedElement xsi:type="class_:Attribute" name="newMutliValuedAttribute" multiValued="false"/>
19+
</changes>
20+
<changes xsi:type="changes:CompositionListDeletion">
21+
<affectedElement href="../../models/correctness2/class.xmi#/1"/>
22+
<feature xsi:type="ecore:EReference" href="Class#//Class/attr"/>
23+
<deletedElement href="../../models/correctness2/class.xmi#/1/@attr.2"/>
24+
</changes>
25+
<changes xsi:type="changes:AttributePropertyChange" oldValue="String">
26+
<affectedElement href="../../models/correctness2/class.xmi#/1/@attr.0"/>
27+
<feature xsi:type="ecore:EReference" href="Class#//Attribute/type"/>
28+
</changes>
29+
</changes:ModelChangeSet>

models/correctness2/class.xmi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns="Class">
3+
<Class name="Family">
4+
<attr name="name" type="/2"/>
5+
<attr name="members" multiValued="true" type="/1"/>
6+
</Class>
7+
<Class name="Person">
8+
<attr name="firstName" type="/2"/>
9+
<attr name="closestFriend" type="/1"/>
10+
<attr name="emailAddresses" multiValued="true" type="/2"/>
11+
</Class>
12+
<DataType name="String"/>
13+
<DataType name="Integer"/>
14+
</xmi:XMI>

models/correctness3/change.xmi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="ASCII"?>
2+
<changes:ModelChangeSet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:changes="http://nmf.codeplex.com/changes" xmlns:class_="Class" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
3+
<changes xsi:type="changes:AttributePropertyChange" newValue="Member" oldValue="Person">
4+
<affectedElement href="../../models/correctness3/class.xmi#/1"/>
5+
<feature xsi:type="ecore:EAttribute" href="Class#//NamedElt/name"/>
6+
</changes>
7+
</changes:ModelChangeSet>

models/correctness3/class.xmi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns="Class">
3+
<Class name="Family">
4+
<attr name="name" type="/2"/>
5+
<attr name="members" multiValued="true" type="/1"/>
6+
</Class>
7+
<Class name="Person">
8+
<attr name="firstName" type="/2"/>
9+
<attr name="closestFriend" type="/1"/>
10+
<attr name="emailAddresses" multiValued="true" type="/2"/>
11+
</Class>
12+
<DataType name="String"/>
13+
<DataType name="Integer"/>
14+
</xmi:XMI>

0 commit comments

Comments
 (0)