Commit bb34b4c8 authored by Thomas Huster's avatar Thomas Huster

[16344] suppress dialgos if elexis.test.mode is set, fix core ui test

parent dcf72b39
Pipeline #11204 passed with stages
in 4 minutes and 45 seconds
......@@ -34,6 +34,7 @@ import ch.elexis.core.ui.dialogs.LoginDialog;
import ch.elexis.core.ui.util.SWTHelper;
import ch.elexis.core.ui.util.SqlWithUiRunner;
import ch.elexis.core.ui.wizards.DBConnectWizard;
import ch.elexis.core.utils.CoreUtil;
import ch.elexis.data.Anwender;
public class CoreOperationAdvisor extends AbstractCoreOperationAdvisor {
......@@ -81,7 +82,7 @@ public class CoreOperationAdvisor extends AbstractCoreOperationAdvisor {
@Override
public void openInformation(String title, String message){
if (isDisplayAvailable()) {
if (isDisplayAvailable() && !CoreUtil.isTestMode()) {
InfoDialogRunnable runnable = new InfoDialogRunnable(title, message);
Display.getDefault().syncExec(runnable);
return;
......@@ -91,7 +92,7 @@ public class CoreOperationAdvisor extends AbstractCoreOperationAdvisor {
@Override
public boolean openQuestion(String title, String message){
if (isDisplayAvailable()) {
if (isDisplayAvailable() && !CoreUtil.isTestMode()) {
QuestionDialogRunnable runnable = new QuestionDialogRunnable(title, message);
Display.getDefault().syncExec(runnable);
return runnable.getResult();
......
......@@ -33,7 +33,7 @@
<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="ch.elexis.core.ui.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dch.elexis.username=007 -Dch.elexis.password=topsecret -Delexis-run-mode=RunFromScratch"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dch.elexis.username=007 -Dch.elexis.password=topsecret -Delexis-run-mode=RunFromScratch -Delexis.test.mode=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="false"/>
......
......@@ -17,7 +17,7 @@
<properties>
<tycho.showEclipseLog>false</tycho.showEclipseLog>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<elexis.ui.test.vmargs>-debug -DjdbcLink=org.h2.Driver:mem:mem_test;AUTO_SERVER=TRUE -Dch.elexis.username=007 -Dch.elexis.password=topsecret -Delexis-run-mode=RunFromScratch</elexis.ui.test.vmargs>
<elexis.ui.test.vmargs>-debug -DjdbcLink=org.h2.Driver:mem:mem_test;AUTO_SERVER=TRUE -Dch.elexis.username=007 -Dch.elexis.password=topsecret -Delexis-run-mode=RunFromScratch -Delexis.test.mode=true</elexis.ui.test.vmargs>
</properties>
<modules>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment