Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JBTIS-974: SY - Use the logic for autobuilding from RedDeer #837

Closed
wants to merge 1 commit into from
Closed

JBTIS-974: SY - Use the logic for autobuilding from RedDeer #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ls.switchyard.reddeer/src/org/jboss/tools/switchyard/reddeer/editor/SwitchYardEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.jboss.reddeer.core.handler.ShellHandler;
import org.jboss.reddeer.core.util.Display;
import org.jboss.reddeer.core.util.ResultRunnable;
import org.jboss.reddeer.direct.preferences.PreferencesUtil;
import org.jboss.reddeer.eclipse.ui.perspectives.JavaEEPerspective;
import org.jboss.reddeer.eclipse.ui.perspectives.ResourcePerspective;
import org.jboss.reddeer.gef.api.EditPart;
Expand All @@ -38,7 +39,6 @@
import org.jboss.tools.switchyard.reddeer.component.SwitchYardComponent;
import org.jboss.tools.switchyard.reddeer.component.SwitchYardComposite;
import org.jboss.tools.switchyard.reddeer.preference.CompositePropertiesPage;
import org.jboss.tools.switchyard.reddeer.utils.PreferenceUtils;
import org.jboss.tools.switchyard.reddeer.wizard.BPELServiceWizard;
import org.jboss.tools.switchyard.reddeer.wizard.BPMNServiceWizard;
import org.jboss.tools.switchyard.reddeer.wizard.BeanServiceWizard;
Expand Down Expand Up @@ -284,7 +284,7 @@ public void runBeforeShellIsClosed(Shell shell) {

super.save();

if (PreferenceUtils.isAutoBuildingOn()) {
if (PreferencesUtil.isAutoBuildingOn()) {
new WaitUntil(new JobIsRunning(), TimePeriod.NORMAL, false);
new WaitWhile(new JobIsRunning(), TimePeriod.VERY_LONG);
} else {
Expand Down
5 changes: 5 additions & 0 deletions ....switchyard.reddeer/src/org/jboss/tools/switchyard/reddeer/project/SwitchYardProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.reddeer.common.exception.RedDeerException;
import org.jboss.reddeer.common.wait.AbstractWait;
import org.jboss.reddeer.common.wait.TimePeriod;
import org.jboss.reddeer.common.wait.WaitWhile;
import org.jboss.reddeer.core.condition.JobIsRunning;
import org.jboss.reddeer.core.condition.ShellWithTextIsActive;
import org.jboss.reddeer.direct.preferences.PreferencesUtil;
import org.jboss.reddeer.eclipse.core.resources.Project;
import org.jboss.reddeer.eclipse.core.resources.ProjectItem;
import org.jboss.reddeer.eclipse.jdt.ui.ProjectExplorer;
Expand Down Expand Up @@ -182,6 +184,9 @@ public ProjectProperties openProperties() {
}

public void build() {
if (PreferencesUtil.isAutoBuildingOn()) {
throw new RedDeerException("Cannot builld a project if projects are built automatically");
}
select();
Menu menu = new ShellMenu("Project", "Build Project");
if (menu.isEnabled()) {
Expand Down
48 changes: 0 additions & 48 deletions ...d.reddeer/src/org/jboss/tools/switchyard/reddeer/requirement/AutoBuildingRequirement.java
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ...ools.switchyard.reddeer/src/org/jboss/tools/switchyard/reddeer/utils/PreferenceUtils.java
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ...chyard.reddeer/src/org/jboss/tools/switchyard/reddeer/wizard/SwitchYardProjectWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.jboss.reddeer.core.condition.ShellWithTextIsActive;
import org.jboss.reddeer.core.handler.WidgetHandler;
import org.jboss.reddeer.core.reference.ReferencedComposite;
import org.jboss.reddeer.direct.preferences.PreferencesUtil;
import org.jboss.reddeer.jface.wizard.NewWizardDialog;
import org.jboss.reddeer.swt.api.Combo;
import org.jboss.reddeer.swt.impl.button.CheckBox;
Expand Down Expand Up @@ -393,6 +394,9 @@ public void create() {

new WaitUntil(new SwitchYardEditorIsOpen(), TimePeriod.LONG);
new SwitchYardProject(name).update();
if (!PreferencesUtil.isAutoBuildingOn()) {
new SwitchYardProject(name).build();
}
}

public SwitchYardProjectWizard activate() {
Expand Down
16 changes: 2 additions & 14 deletions ....ui.bot.test/src/org/jboss/tools/switchyard/ui/bot/test/SwitchYardEditorBindingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.jboss.reddeer.eclipse.jdt.ui.ProjectExplorer;
import org.jboss.reddeer.junit.requirement.inject.InjectRequirement;
import org.jboss.reddeer.junit.runner.RedDeerSuite;
import org.jboss.reddeer.requirements.autobuilding.AutoBuildingRequirement.AutoBuilding;
import org.jboss.reddeer.swt.impl.button.FinishButton;
import org.jboss.reddeer.swt.impl.button.OkButton;
import org.jboss.reddeer.workbench.handler.EditorHandler;
Expand Down Expand Up @@ -73,7 +74,6 @@
import org.jboss.tools.switchyard.reddeer.project.SwitchYardProject;
import org.jboss.tools.switchyard.reddeer.requirement.SwitchYardRequirement;
import org.jboss.tools.switchyard.reddeer.requirement.SwitchYardRequirement.SwitchYard;
import org.jboss.tools.switchyard.reddeer.utils.PreferenceUtils;
import org.jboss.tools.switchyard.reddeer.wizard.ReferenceWizard;
import org.junit.After;
import org.junit.AfterClass;
Expand All @@ -91,6 +91,7 @@
*
*/
@SwitchYard
@AutoBuilding(false)
@RunWith(RedDeerSuite.class)
public class SwitchYardEditorBindingsTest {

Expand Down Expand Up @@ -122,24 +123,11 @@ public class SwitchYardEditorBindingsTest {
"SOAP",
"SQL" };

private static String autoBuilding;

private SwitchYardEditor editor;

@InjectRequirement
private static SwitchYardRequirement switchyardRequirement;

@BeforeClass
public static void turnOffAutoBuilding() {
autoBuilding = PreferenceUtils.getAutoBuilding();
PreferenceUtils.setAutoBuilding("false");
}

@AfterClass
public static void turnBackAutoBuilding() {
PreferenceUtils.setAutoBuilding(autoBuilding);
}

@BeforeClass
public static void maximizeWorkbench() {
new WorkbenchShell().maximize();
Expand Down
16 changes: 2 additions & 14 deletions ...t.test/src/org/jboss/tools/switchyard/ui/bot/test/SwitchYardEditorDomainSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.jboss.reddeer.eclipse.ui.perspectives.JavaEEPerspective;
import org.jboss.reddeer.junit.requirement.inject.InjectRequirement;
import org.jboss.reddeer.junit.runner.RedDeerSuite;
import org.jboss.reddeer.requirements.autobuilding.AutoBuildingRequirement.AutoBuilding;
import org.jboss.reddeer.requirements.openperspective.OpenPerspectiveRequirement.OpenPerspective;
import org.jboss.reddeer.swt.api.TreeItem;
import org.jboss.reddeer.workbench.impl.shell.WorkbenchShell;
Expand All @@ -21,7 +22,6 @@
import org.jboss.tools.switchyard.reddeer.requirement.SwitchYardRequirement;
import org.jboss.tools.switchyard.reddeer.requirement.SwitchYardRequirement.SwitchYard;
import org.jboss.tools.switchyard.reddeer.shell.DomainPropertiesFileShell;
import org.jboss.tools.switchyard.reddeer.utils.PreferenceUtils;
import org.jboss.tools.switchyard.reddeer.wizard.SecurityConfigurationWizard;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Expand All @@ -35,6 +35,7 @@
*
*/
@SwitchYard
@AutoBuilding(false)
@OpenPerspective(JavaEEPerspective.class)
@RunWith(RedDeerSuite.class)
public class SwitchYardEditorDomainSettingsTest {
Expand All @@ -45,19 +46,6 @@ public class SwitchYardEditorDomainSettingsTest {
@InjectRequirement
private static SwitchYardRequirement switchyardRequirement;

private static String autoBuilding;

@BeforeClass
public static void turnOffAutoBuilding() {
autoBuilding = PreferenceUtils.getAutoBuilding();
PreferenceUtils.setAutoBuilding("false");
}

@AfterClass
public static void turnBackAutoBuilding() {
PreferenceUtils.setAutoBuilding(autoBuilding);
}

@BeforeClass
public static void createProject() {
closeSwitchYardEditor();
Expand Down
19 changes: 2 additions & 17 deletions ....test/src/org/jboss/tools/switchyard/ui/bot/test/SwitchYardEditorImplementationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.jboss.reddeer.junit.execution.annotation.RunIf;
import org.jboss.reddeer.junit.requirement.inject.InjectRequirement;
import org.jboss.reddeer.junit.runner.RedDeerSuite;
import org.jboss.reddeer.requirements.autobuilding.AutoBuildingRequirement.AutoBuilding;
import org.jboss.reddeer.swt.impl.button.NoButton;
import org.jboss.reddeer.swt.impl.ctab.DefaultCTabItem;
import org.jboss.reddeer.swt.impl.shell.DefaultShell;
Expand All @@ -31,7 +32,6 @@
import org.jboss.tools.switchyard.reddeer.project.SwitchYardProject;
import org.jboss.tools.switchyard.reddeer.requirement.SwitchYardRequirement;
import org.jboss.tools.switchyard.reddeer.requirement.SwitchYardRequirement.SwitchYard;
import org.jboss.tools.switchyard.reddeer.utils.PreferenceUtils;
import org.jboss.tools.switchyard.reddeer.wizard.BPELServiceWizard;
import org.jboss.tools.switchyard.reddeer.wizard.BPMNServiceWizard;
import org.jboss.tools.switchyard.reddeer.wizard.BeanServiceWizard;
Expand All @@ -46,7 +46,6 @@
import org.jboss.tools.switchyard.ui.bot.test.condition.SwitchYardRequirementSupportBPMN;
import org.jboss.tools.switchyard.ui.bot.test.condition.SwitchYardRequirementSupportDrools;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
Expand All @@ -60,6 +59,7 @@
*
*/
@SwitchYard
@AutoBuilding(false)
@RunWith(RedDeerSuite.class)
public class SwitchYardEditorImplementationsTest {

Expand All @@ -76,8 +76,6 @@ public class SwitchYardEditorImplementationsTest {
@InjectRequirement
private static SwitchYardRequirement switchyardRequirement;

private static String autoBuilding;

private List<String[]> classesToDelete;
private List<String[]> resourcesToDelete;
private List<String> componentsToDelete;
Expand All @@ -87,19 +85,6 @@ public static void maximizeWorkbench() {
new WorkbenchShell().maximize();
}

@BeforeClass
public static void turnOffAutoBuilding() {
autoBuilding = PreferenceUtils.getAutoBuilding();
PreferenceUtils.setAutoBuilding("false");
}

@AfterClass
public static void turnBackAutoBuilding() {
if (autoBuilding != null) {
PreferenceUtils.setAutoBuilding(autoBuilding);
}
}

@BeforeClass
public static void createProject() {
switchyardRequirement.project(PROJECT_NAME).implAll().create();
Expand Down
17 changes: 2 additions & 15 deletions ...i.bot.test/src/org/jboss/tools/switchyard/ui/bot/test/SwitchYardEditorValidatorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@

import org.jboss.reddeer.junit.requirement.inject.InjectRequirement;
import org.jboss.reddeer.junit.runner.RedDeerSuite;
import org.jboss.reddeer.requirements.autobuilding.AutoBuildingRequirement.AutoBuilding;
import org.jboss.reddeer.workbench.impl.shell.WorkbenchShell;
import org.jboss.tools.switchyard.reddeer.editor.SwitchYardEditor;
import org.jboss.tools.switchyard.reddeer.preference.CompositePropertiesPage;
import org.jboss.tools.switchyard.reddeer.project.SwitchYardProject;
import org.jboss.tools.switchyard.reddeer.requirement.SwitchYardRequirement;
import org.jboss.tools.switchyard.reddeer.requirement.SwitchYardRequirement.SwitchYard;
import org.jboss.tools.switchyard.reddeer.utils.PreferenceUtils;
import org.jboss.tools.switchyard.reddeer.wizard.ValidatorWizard;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
Expand All @@ -26,6 +25,7 @@
*
*/
@SwitchYard
@AutoBuilding(false)
@RunWith(RedDeerSuite.class)
public class SwitchYardEditorValidatorsTest {

Expand All @@ -35,19 +35,6 @@ public class SwitchYardEditorValidatorsTest {
@InjectRequirement
private static SwitchYardRequirement switchYardRequirement;

private static String autoBuilding;

@BeforeClass
public static void turnOffAutoBuilding() {
autoBuilding = PreferenceUtils.getAutoBuilding();
PreferenceUtils.setAutoBuilding("false");
}

@AfterClass
public static void turnBackAutoBuilding() {
PreferenceUtils.setAutoBuilding(autoBuilding);
}

@BeforeClass
public static void maximizeWorkbench() {
new WorkbenchShell().maximize();
Expand Down