diff --git a/integrationtests/org.eclipse.xtext.swtbot.testing/src/org/eclipse/xtext/swtbot/testing/api/NewProjectWizardAPI.java b/integrationtests/org.eclipse.xtext.swtbot.testing/src/org/eclipse/xtext/swtbot/testing/api/NewProjectWizardAPI.java index 24d90849..5c3e1d31 100644 --- a/integrationtests/org.eclipse.xtext.swtbot.testing/src/org/eclipse/xtext/swtbot/testing/api/NewProjectWizardAPI.java +++ b/integrationtests/org.eclipse.xtext.swtbot.testing/src/org/eclipse/xtext/swtbot/testing/api/NewProjectWizardAPI.java @@ -143,12 +143,6 @@ public NewXtextProjectWizardConfigurationPageAPI toggleTestingSupport() { return this; } - public NewXtextProjectWizardConfigurationPageAPI toggleWebIntegration() { - System.out.println("Toggle 'Web Integration'"); - shell.bot().checkBox("Web Integration").click(); - return this; - } - public NewXtextProjectWizardConfigurationPageAPI setMavenBuildType() { System.out.println("Set 'Maven Build Type'"); shell.bot().comboBox(0).setSelection("Maven"); diff --git a/integrationtests/org.eclipse.xtext.swtbot.tests/src/org/eclipse/xtext/swtbot/tests/XtextNewProjectWizardTest.java b/integrationtests/org.eclipse.xtext.swtbot.tests/src/org/eclipse/xtext/swtbot/tests/XtextNewProjectWizardTest.java index 51d09ea9..707e5e55 100644 --- a/integrationtests/org.eclipse.xtext.swtbot.tests/src/org/eclipse/xtext/swtbot/tests/XtextNewProjectWizardTest.java +++ b/integrationtests/org.eclipse.xtext.swtbot.tests/src/org/eclipse/xtext/swtbot/tests/XtextNewProjectWizardTest.java @@ -288,140 +288,6 @@ public void xtextProject_forEclipse_withTesting_withGradle() throws Exception { assertEquals(problemsView().getErrorMessages().toString(), 0, problemsView().errorCount()); } - @Test - public void xtextProject_webIntegration_withMaven_plain() throws Exception { - System.out.println(); - System.out.println("Starting Test 'xtextProject_webIntegration_withMaven_plain'"); - // create xtext project - mainMenu().openNewProjectWizard().selectXtextProject().selectJava21().next().toggleEclipsePlugin().toggleWebIntegration() - .setMavenBuildType().finish(); - sleep(500); // wait for asynchronous updates - waitForBuild(); - - // check example projects are created - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.ide")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.parent")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.tests")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.web")); - - packageExplorer().mavenRefresh("org.xtext.example.mydsl.parent"); - waitForBuild(); - - // expand projects to get more meaningful screenshots for trouble shooting - packageExplorer().expand("org.xtext.example.mydsl.web", "Maven Dependencies"); - - // run the maven build and wait for successful termination - consoleView().resetAndClearAllConsoles(); - packageExplorer().runMavenInstall("org.xtext.example.mydsl.parent", "pom.xml"); - consoleView().waitForMavenToFinishWithSuccess(); - packageExplorer().refreshAllProjects(); - waitForBuild(); - // workaround for race ... - cleanBuild(); - waitForBuild(); - - // check example projects are error free - assertEquals(problemsView().getErrorMessages().toString(), 0, problemsView().errorCount()); - } - - @Test - public void xtextProject_webIntegration_withMaven_nested() throws Exception { - System.out.println(); - System.out.println("Starting Test 'xtextProject_webIntegration_withMaven_nested'"); - // create xtext project - mainMenu().openNewProjectWizard().selectXtextProject().selectJava21().next().toggleEclipsePlugin().toggleWebIntegration() - .setMavenBuildType().setMavenSourceLayout().finish(); - sleep(500); // wait for asynchronous updates - waitForBuild(); - - // check example projects are created - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.ide")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.parent")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.web")); - - packageExplorer().mavenRefresh("org.xtext.example.mydsl.parent"); - waitForBuild(); - - // expand projects to get more meaningful screenshots for trouble shooting - packageExplorer().expand("org.xtext.example.mydsl.web", "Maven Dependencies"); - - // run the maven build and wait for successful termination - consoleView().resetAndClearAllConsoles(); - packageExplorer().runMavenInstall("org.xtext.example.mydsl.parent", "pom.xml"); - consoleView().waitForMavenToFinishWithSuccess(); - packageExplorer().refreshAllProjects(); - waitForBuild(); - // workaround for race ... - cleanBuild(); - waitForBuild(); - - // check example projects are error free - assertEquals(problemsView().getErrorMessages().toString(), 0, problemsView().errorCount()); - } - - @Test - public void xtextProject_webIntegration_withGradle_plain() throws Exception { - System.out.println(); - System.out.println("Starting Test 'xtextProject_webIntegration_withGradle_plain'"); - // create xtext project - mainMenu().openNewProjectWizard().selectXtextProject().selectJava21().next().toggleEclipsePlugin().toggleWebIntegration() - .setGradleBuildType().finish(); - sleep(500); // wait for asynchronous updates - waitForBuild(); - - // check example projects are created - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.ide")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.parent")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.tests")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.web")); - - // run the maven build and wait for successful termination - consoleView().resetAndClearAllConsoles(); - packageExplorer().runGradleTest("org.xtext.example.mydsl.parent", "build.gradle"); - consoleView().waitForGradleToFinishWithSuccess(); - packageExplorer().refreshAllProjects(); - waitForBuild(); - // workaround for race ... - cleanBuild(); - waitForBuild(); - - // check example projects are error free - assertEquals(problemsView().getErrorMessages().toString(), 0, problemsView().errorCount()); - } - - @Test - public void xtextProject_webIntegration_withGradle_nested() throws Exception { - System.out.println(); - System.out.println("Starting Test 'xtextProject_webIntegration_withGradle_nested'"); - // create xtext project - mainMenu().openNewProjectWizard().selectXtextProject().selectJava21().next().toggleEclipsePlugin().toggleWebIntegration() - .setGradleBuildType().setMavenSourceLayout().finish(); - sleep(500); // wait for asynchronous updates - waitForBuild(); - - // check example projects are created - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.ide")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.parent")); - assertTrue(packageExplorer().projectExist("org.xtext.example.mydsl.web")); - - // run the maven build and wait for successful termination - consoleView().resetAndClearAllConsoles(); - packageExplorer().runGradleTest("org.xtext.example.mydsl.parent", "build.gradle"); - consoleView().waitForGradleToFinishWithSuccess(); - packageExplorer().refreshAllProjects(); - waitForBuild(); - // workaround for race ... - cleanBuild(); - waitForBuild(); - - // check example projects are error free - assertEquals(problemsView().getErrorMessages().toString(), 0, problemsView().errorCount()); - } - @Test public void xtextProject_webIntegration_withLSPRegular() throws Exception { System.out.println();