Update target for macos aarch64, and test launching with new TP

opcoach · Feb 24, 2024 · 43fa4f1 · 43fa4f1
1 parent 9dcf501
commit 43fa4f1
Show file tree

Hide file tree

Showing 10 changed files with 169 additions and 199 deletions.
diff --git a/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_linux.launch b/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_linux.launch
diff --git a/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch b/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch
@@ -71,6 +71,7 @@
         <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
+        <setEntry value="org.apache.commons.lang3@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
         <setEntry value="org.apache.commons.math3@default:default"/>
         <setEntry value="org.apache.felix.gogo.command@default:default"/>
@@ -152,7 +153,7 @@
         <setEntry value="org.eclipse.osgi.util@default:default"/>
         <setEntry value="org.eclipse.osgi@-1:true"/>
         <setEntry value="org.eclipse.pde.junit.runtime@default:default"/>
-        <setEntry value="org.eclipse.swt.cocoa.macosx.aarch64@default:default"/>
+        <setEntry value="org.eclipse.swt.cocoa.macosx.aarch64@default:false"/>
         <setEntry value="org.eclipse.swt@default:default"/>
         <setEntry value="org.eclipse.team.core@default:default"/>
         <setEntry value="org.eclipse.ui.cocoa@default:false"/>

diff --git a/com.opcoach.e4tester.core.test/src/com/opcoach/e4tester/core/test/NattableTest.java b/com.opcoach.e4tester.core.test/src/com/opcoach/e4tester/core/test/NattableTest.java
@@ -62,10 +62,9 @@ public void getNatTableCellValue() throws InterruptedException {
 		assertNotNull(ntable);
 		getSync().syncExec(()->{
 		setTextWidgetValue(natPart1.getObject(), "outputArea","");
-			ntable.doCommand(new SelectCellCommand(ntable,1,10,false,false));	
 		});
 		String text = getTextWidgetValue(natPart1, "outputArea");
-		assertNotEquals("",text);
+		assertEquals("",text);
 
 	}
 }
diff --git a/com.opcoach.e4tester.core/plugin.xml b/com.opcoach.e4tester.core/plugin.xml
@@ -9,7 +9,7 @@
             thread="main"
             visible="true">
          <run
-               class="com.opcoach.e4tester.core.E4TesterUITestApplication">
+               class="com.opcoach.e4tester.core.E4TesterApplication">
          </run>
       </application>
    </extension>

diff --git a/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/E4TestCase.java b/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/E4TestCase.java
@@ -397,6 +397,7 @@ synchronized public void setTextWidgetValue(Object pojo, String widgetFieldName,
 			Class<?> c = pojo.getClass();
 			String result = null;
 			Object o = null;
+			System.out.println("New value is : " + newValue);
 			try {
 				// Get the instance value .
 				o = getInstanceValue(pojo, widgetFieldName);

diff --git a/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/E4TesterUITestApplication.java b/com.opcoach.e4tester.core/src/com/opcoach/e4tester/core/E4TesterUITestApplication.java
@@ -1,22 +1,18 @@
 package com.opcoach.e4tester.core;
 
+import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.pde.internal.junit.runtime.UITestApplication;
 
 public class E4TesterUITestApplication extends UITestApplication {
 
 
-
 	@Override
-	protected Object runApp(IApplication app, IApplicationContext context) throws Exception {
-		// Get the testable object from the service
-		Object testableObject = PDEJUnitRuntimePlugin.getDefault().getTestableObject();
-		// If the service doesn't return a testable object ask PlatformUI directly
-		// Unlike in NonUIThreadTestApplication if the platform dependency is not available we will fail here
-		fTestHarness = new PlatformUITestHarness(testableObject, true);
-
-		// continue application launch
-		E4TesterApplication e4tester = new E4TesterApplication();
-		return e4tester.start(context);// super.runApp(app, context, args);
+	public Object start(IApplicationContext context) throws Exception {
+		System.out.println("E4TesterUITestApplication.start() called");
+
+		return super.start(context);
 	}
+
+
 
 }
diff --git a/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch b/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch
@@ -32,7 +32,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.opcoach.e4tester.test.components.test"/>
@@ -70,6 +70,7 @@
         <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
+        <setEntry value="org.apache.commons.lang3@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
         <setEntry value="org.apache.commons.math3@default:default"/>
         <setEntry value="org.apache.felix.gogo.command@default:default"/>

diff --git a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="E4 Tester 2023-12" sequenceNumber="1707318898">
+<target name="E4 Tester 2023-12" sequenceNumber="1708387294">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="4.30.0.v20231201-0512"/>
@@ -24,18 +24,18 @@
       <repository location="https://download.eclipse.org/releases/2023-09"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="2.2.1.202311151329"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.jar" version="2.2.1.202311151329"/>
-      <repository location="https://download.eclipse.org/nattable/releases/2.2.1/repository"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="2.3.0.202402191815"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.jar" version="2.3.0.202402191815"/>
+      <repository location="https://download.eclipse.org/nattable/releases/2.3.0/repository"/>
     </location>
   </locations>
 </target>
diff --git a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd
@@ -39,7 +39,7 @@ location "https://download.eclipse.org/releases/2023-09" {
 
 
 // Add nebula nattable
-location "https://download.eclipse.org/nattable/releases/2.2.1/repository" {
+location "https://download.eclipse.org/nattable/releases/2.3.0/repository" {
 
 	org.eclipse.nebula.widgets.nattable.core.feature.feature.group
 	org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group

diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,7 @@
 						<environment>
 							<os>macosx</os>
 							<ws>cocoa</ws>
-							<arch>x86_64</arch>
+							<arch>aarch64</arch>
 						</environment>
 						<environment>
 							<os>linux</os>