diff --git a/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_linux.launch b/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_linux.launch index d4ee756..e5b96d6 100644 --- a/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_linux.launch +++ b/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_linux.launch @@ -1,171 +1,143 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch b/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch index da18a35..fd58fb8 100644 --- 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 @@ + @@ -152,7 +153,7 @@ - + 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 index 66402ef..0946c55 100644 --- 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 index 5bf1fe7..7e88bf3 100644 --- a/com.opcoach.e4tester.core/plugin.xml +++ b/com.opcoach.e4tester.core/plugin.xml @@ -9,7 +9,7 @@ thread="main" visible="true"> + class="com.opcoach.e4tester.core.E4TesterApplication"> 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 index 046aa3a..06900ef 100644 --- 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 index 49711cd..e26d2bf 100644 --- 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 index 75afc4a..f2b4af0 100644 --- 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 @@ - + @@ -70,6 +70,7 @@ + diff --git a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target index 12deb1f..de2c82e 100644 --- a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target +++ b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target @@ -1,7 +1,7 @@ - + @@ -24,18 +24,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd index fc2901a..d033656 100644 --- 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 index a8d36c9..39f42d2 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ macosx cocoa - x86_64 + aarch64 linux