[unrelated] Fix warnings
diff --git a/tests/org.eclipse.qvtd.umlx.tests/build.properties b/tests/org.eclipse.qvtd.umlx.tests/build.properties
index 2b112c4..215eafe 100644
--- a/tests/org.eclipse.qvtd.umlx.tests/build.properties
+++ b/tests/org.eclipse.qvtd.umlx.tests/build.properties
@@ -1,7 +1,9 @@
-source.. = src/
+source.. = src/,\
+ src-gen/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties,\
- about.html
+ about.html,\
+ plugin.xml
src.includes = about.html
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/build.properties b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/build.properties
index 2b04ed1..62e9a05 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/build.properties
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/build.properties
@@ -18,7 +18,6 @@
build.properties
jars.compile.order = .
source.. = src/,\
- src-gen/,\
- test-gen/
+ src-gen/
output.. = bin/
src.includes = about.html
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2PersonsNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2PersonsNormalizer.java
index 35098e6..63b1546 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2PersonsNormalizer.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2PersonsNormalizer.java
@@ -74,7 +74,7 @@
assert maleClass != null;
EClass personClass = (EClass) ePackage.getEClassifier(PersonsPackage.Literals.PERSON.getName());
assert personClass != null;
- @NonNull EAttribute personFullName = (EAttribute) personClass.getEStructuralFeature(PersonsPackage.Literals.PERSON__FULL_NAME.getName());
+ EAttribute personFullName = (EAttribute) personClass.getEStructuralFeature(PersonsPackage.Literals.PERSON__FULL_NAME.getName());
assert personFullName != null;
PersonComparator personComparator = new PersonComparator(femaleClass, personFullName);
ECollections.sort(resource.getContents(), personComparator);
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hsl/HSV2HSLNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hsl/HSV2HSLNormalizer.java
index 65f823d..898b31e 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hsl/HSV2HSLNormalizer.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hsl/HSV2HSLNormalizer.java
@@ -60,16 +60,18 @@
EPackage ePackage = eRoot.eClass().getEPackage();
EClass hslNodeClass = (EClass) ePackage.getEClassifier(HSLTreePackage.Literals.HSL_NODE.getName());
assert hslNodeClass != null;
- @NonNull EReference hslNodeChildren = (EReference) hslNodeClass.getEStructuralFeature(HSLTreePackage.Literals.HSL_NODE__CHILDREN.getName());
+ EReference hslNodeChildren = (EReference) hslNodeClass.getEStructuralFeature(HSLTreePackage.Literals.HSL_NODE__CHILDREN.getName());
assert hslNodeChildren != null;
- @NonNull EAttribute hslNodeName = (EAttribute) hslNodeClass.getEStructuralFeature(HSLTreePackage.Literals.HSL_NODE__NAME.getName());
+ EAttribute hslNodeName = (EAttribute) hslNodeClass.getEStructuralFeature(HSLTreePackage.Literals.HSL_NODE__NAME.getName());
assert hslNodeName != null;
HLSNodeComparator personComparator = new HLSNodeComparator(hslNodeName);
List<@NonNull EObject> allNodes = new ArrayList<@NonNull EObject>();
for (TreeIterator<EObject> tit = resource.getAllContents(); tit.hasNext(); ) {
EObject eObject = tit.next();
if (hslNodeClass.isInstance(eObject)) {
- allNodes.add(eObject);
+ if (eObject != null) {
+ allNodes.add(eObject);
+ }
}
}
for (@NonNull EObject hslNode : allNodes) {
