Skip to content

Commit bdcd7fc

Browse files
AnAvailableNameAnAvailableName
committed
Adjust test/test data.
1 parent 0a8cdc4 commit bdcd7fc

8 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎lang/frontend/cli/src/test/resources/models/pizza.ecore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
eType="#//Food"/>
1212
</eClassifiers>
1313
<eClassifiers xsi:type="ecore:EClass" name="Root">
14-
<eStructuralFeatures xsi:type="ecore:EReference" name="allFoods" ordered="false"
14+
<eStructuralFeatures xsi:type="ecore:EReference" name="foods" ordered="false"
1515
upperBound="-1" eType="#//Food" containment="true"/>
16-
<eStructuralFeatures xsi:type="ecore:EReference" name="allRestaurants" ordered="false"
16+
<eStructuralFeatures xsi:type="ecore:EReference" name="restaurants" ordered="false"
1717
upperBound="-1" eType="#//Restaurant" containment="true"/>
1818
</eClassifiers>
1919
</ecore:EPackage>

‎lang/frontend/cli/src/test/resources/results/actor-rating.ecore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<eStructuralFeatures xsi:type="ecore:EAttribute" name="avgMovieScore" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
77
</eClassifiers>
88
<eClassifiers xsi:type="ecore:EClass" name="Root">
9-
<eStructuralFeatures xsi:type="ecore:EReference" name="allActors" ordered="false"
9+
<eStructuralFeatures xsi:type="ecore:EReference" name="actors" ordered="false"
1010
upperBound="-1" eType="#//Actor" containment="true"/>
1111
</eClassifiers>
1212
</ecore:EPackage>

‎lang/frontend/cli/src/test/resources/results/books-on-tape.ecore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<eStructuralFeatures xsi:type="ecore:EAttribute" name="minutesPerPage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
1010
</eClassifiers>
1111
<eClassifiers xsi:type="ecore:EClass" name="Root">
12-
<eStructuralFeatures xsi:type="ecore:EReference" name="allAudioBooks" ordered="false"
12+
<eStructuralFeatures xsi:type="ecore:EReference" name="audioBooks" ordered="false"
1313
upperBound="-1" eType="#//AudioBook" containment="true"/>
1414
</eClassifiers>
1515
</ecore:EPackage>

‎lang/frontend/cli/src/test/resources/results/customer-borrowings.ecore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
1111
</eClassifiers>
1212
<eClassifiers xsi:type="ecore:EClass" name="Root">
13-
<eStructuralFeatures xsi:type="ecore:EReference" name="allCustomers" ordered="false"
13+
<eStructuralFeatures xsi:type="ecore:EReference" name="customers" ordered="false"
1414
upperBound="-1" eType="#//Customer" containment="true"/>
15-
<eStructuralFeatures xsi:type="ecore:EReference" name="allBooks" ordered="false"
15+
<eStructuralFeatures xsi:type="ecore:EReference" name="books" ordered="false"
1616
upperBound="-1" eType="#//Book" containment="true"/>
1717
</eClassifiers>
1818
</ecore:EPackage>

‎lang/frontend/cli/src/test/resources/results/movies.ecore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<eStructuralFeatures xsi:type="ecore:EAttribute" name="avgRating" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
88
</eClassifiers>
99
<eClassifiers xsi:type="ecore:EClass" name="Root">
10-
<eStructuralFeatures xsi:type="ecore:EReference" name="allMovies" ordered="false"
10+
<eStructuralFeatures xsi:type="ecore:EReference" name="movies" ordered="false"
1111
upperBound="-1" eType="#//Movie" containment="true"/>
12-
<eStructuralFeatures xsi:type="ecore:EReference" name="allActors" ordered="false"
12+
<eStructuralFeatures xsi:type="ecore:EReference" name="actors" ordered="false"
1313
upperBound="-1" eType="#//Actor" containment="true"/>
1414
</eClassifiers>
1515
<eClassifiers xsi:type="ecore:EClass" name="Actor">

‎lang/frontend/cli/src/test/resources/results/pizza.xmi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="ASCII"?>
22
<pizza:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:pizza="http://example.org/pizza">
3-
<allFoods name="Pizza Margherita" price="7.0"/>
4-
<allFoods name="Fanta" price="5.0"/>
5-
<allFoods name="Maultaschen" price="8.0"/>
6-
<allRestaurants name="Pizzeria Toni" sells="//@allFoods.0 //@allFoods.1"/>
3+
<foods name="Pizza Margherita" price="7.0"/>
4+
<foods name="Fanta" price="5.0"/>
5+
<foods name="Maultaschen" price="8.0"/>
6+
<restaurants name="Pizzeria Toni" sells="//@foods.0 //@foods.1"/>
77
</pizza:Root>

‎lang/frontend/language/src/test/java/tools/vitruv/neojoin/aqr/RootAQRTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ void rootReferences() {
7676
assertThat(root)
7777
.hasNoCondition()
7878
.hasCalculatedAttribute("test", "EInt")
79-
.hasGeneratedReference("allRestaurantys", "Restauranty") // explicit
80-
.hasGeneratedReference("allFoods", "Food") // implicit
79+
.hasGeneratedReference("restaurantys", "Restauranty") // explicit
80+
.hasGeneratedReference("foods", "Food") // implicit
8181
.hasNoMoreFeatures();
8282
}
8383
)

‎lang/frontend/language/src/test/java/tools/vitruv/neojoin/parse/RootParseTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void featureNameConflict() {
4444
from Food create
4545
4646
create root Rooty {
47-
allFoods := 5
47+
foods := 5
4848
}
4949
""");
5050

0 commit comments

Comments
 (0)