Improve graphical editor UI test focus handling 🤖

Jenkinsfile

@@ -21,7 +21,7 @@ pipeline {
           withCredentials([string(credentialsId: 'osate-ci_sonarcloud', variable: 'SONARTOKEN')]) {
             wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
               sh 'mvn -s releng/osate.releng/seisettings.xml clean verify \
-                  -Plocal -Dsonar.token=$SONARTOKEN \
+                  -Plocal,with-ge-tests -Dsonar.token=$SONARTOKEN \
                   -Dsonar.pullrequest.provider=GitHub \
                   -Dsonar.pullrequest.github.repository=$(echo $CHANGE_URL | cut -d/ -f4,5) \
                   -Dsonar.pullrequest.key=$CHANGE_ID \
@@ -43,7 +43,7 @@ pipeline {
           withCredentials([string(credentialsId: 'osate-ci_sonarcloud', variable: 'SONARTOKEN')]) {
             wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
               sh 'mvn -s releng/osate.releng/seisettings.xml clean verify \
-                  -Pfull -Dsonar.token=$SONARTOKEN \
+                  -Pfull,with-ge-tests -Dsonar.token=$SONARTOKEN \
                   -Declipse.p2.mirrors=false -DfailIfNoTests=false \
                   -Dcodecoverage=true -Dspotbugs=true -Djavadoc=true'
             }
@@ -100,4 +100,4 @@ pipeline {
       )
     }
   } 
-}
+}

ge/org.osate.ge.errormodel/src/org/osate/ge/errormodel/ui/viewmodels/BaseTypeSetTypeTokensModel.java

@@ -145,7 +145,7 @@ public final void setTypeTokens(final List<TypeToken> value) {
 			// Modify the AADL model
 			modifyTypeSets(ts -> {
 				ts.getTypeTokens().clear();
-				ts.getTypeTokens().addAll(inner.getTypeTokenList());
+				ts.getTypeTokens().addAll(EcoreUtil.copyAll(inner.getTypeTokenList()));
 			});
 		}
 	}

ge/org.osate.ge.tests/src/org/osate/ge/tests/endToEnd/PrimaryEndToEndTest.java

@@ -793,10 +793,10 @@ private void createSoftwareProject() {
 				threadsImplElement.join(getFeatureRelativeReference("point_cloud")),
 				getFlowSpecificationRelativeReference("threads_new_flow_spec"), "point_cloud_source");
 
-		// Create flow sink threads.impl.integrator.point_cloud
+		// Create flow source threads.impl.integrator.point_cloud
 		createFlowIndicatorAndLayout(softwareDiagram, integratorScImpl,
-				"Flow Sink Specification", integratorScImpl.join(getFeatureRelativeReference("point_cloud")),
-				getFlowSpecificationRelativeReference("integrator_new_flow_spec"), "point_cloud_sink");
+				"Flow Source Specification", integratorScImpl.join(getFeatureRelativeReference("point_cloud")),
+				getFlowSpecificationRelativeReference("integrator_new_flow_spec"), "point_cloud_source");
 
 		// Create connection threads.impl.point_cloud -> threads.impl.integrator.point_cloud
 		createConnectionAndLayout(softwareDiagram,
@@ -835,7 +835,7 @@ private void createSoftwareProject() {
 				element(getRelativeReferenceForPackage(SOFTWARE), getClassifierRelativeReference(
 						"threads.impl"),
 						getSubcomponentRelativeReference("integrator"),
-						getFlowSpecificationRelativeReference("point_cloud_sink")),
+						getFlowSpecificationRelativeReference("point_cloud_source")),
 				element(getRelativeReferenceForPackage(SOFTWARE), getClassifierRelativeReference(
 						"threads.impl"),
 						getConnectionRelativeReference("point_cloud_connection")),

ge/org.osate.ge.tests/src/org/osate/ge/tests/endToEnd/util/OsateGeTestUtil.java

@@ -92,6 +92,9 @@ public static void openDiagramEditor(final DiagramReference diagram) {
 		// Don't do anything if diagram is active
 		if (!isDiagramEditorActive(diagram)) {
 			doubleClickInAadlNavigator(diagram.pathSegments.toArray(new String[diagram.pathSegments.size()]));
+			waitUntil(() -> isDiagramEditorOpen(diagram),
+					"Editor for diagram path segments '" + diagram + "' did not open.");
+			activateDiagramEditor(diagram);
 			waitForDiagramActive(diagram);
 		}
 	}