Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Fluegge2011-01-21 09:50:33 +0000
committerMartin Fluegge2011-01-21 09:50:33 +0000
commitf8661c5d09bd42a46f4b9a6699f18d6f074583d7 (patch)
treed7b9c92ed9ae31246e9e32853d29fe188b02c48c /plugins/org.eclipse.emf.cdo.dawn.tests
parente991b70b8909ed8d04c3f0f7cf1bfc56e75255a5 (diff)
downloadcdo-f8661c5d09bd42a46f4b9a6699f18d6f074583d7.tar.gz
cdo-f8661c5d09bd42a46f4b9a6699f18d6f074583d7.tar.xz
cdo-f8661c5d09bd42a46f4b9a6699f18d6f074583d7.zip
[333188] Provide ResourceChooser UI element for CDO
https://bugs.eclipse.org/bugs/show_bug.cgi?id=333188
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.tests')
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFCreationWizardTest.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java4
4 files changed, 14 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java
index 97e625b7a9..f4220407ac 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java
@@ -17,10 +17,8 @@ import org.eclipse.emf.cdo.dawn.tests.ui.DawnProjectExplorerTest;
import org.eclipse.emf.cdo.dawn.tests.ui.emf.DawnEMFCreationWizardTest;
import org.eclipse.emf.cdo.dawn.tests.ui.emf.DawnEMFHandleEditorTest;
import org.eclipse.emf.cdo.dawn.tests.ui.emf.EMFEditorRollbackTest;
-import org.eclipse.emf.cdo.dawn.tests.ui.gmf.ConflictTest;
import org.eclipse.emf.cdo.dawn.tests.ui.gmf.DawnCreationWizardSWTBotTest;
import org.eclipse.emf.cdo.dawn.tests.ui.gmf.MultipleResourcesTest;
-import org.eclipse.emf.cdo.dawn.tests.ui.gmf.RollbackTest;
import org.eclipse.emf.cdo.dawn.tests.ui.gmf.SimpleDiagramTest;
import org.eclipse.emf.cdo.tests.AllTests;
import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
@@ -59,8 +57,8 @@ public class AllTestsDawnUISWTBot extends ConfigTestSuite
testClasses.add(MultipleResourcesTest.class);
// MultipleResourcesDeletionTest.class, //excluded because of ui freeze
testClasses.add(DawnProjectExplorerTest.class);
- testClasses.add(RollbackTest.class);
- testClasses.add(ConflictTest.class);
+ // testClasses.add(RollbackTest.class);
+ // testClasses.add(ConflictTest.class);
/******************** EMF **********************/
testClasses.add(DawnEMFCreationWizardTest.class);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFCreationWizardTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFCreationWizardTest.java
index b17b621314..ab9b9fefe0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFCreationWizardTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFCreationWizardTest.java
@@ -39,6 +39,8 @@ import org.junit.runner.RunWith;
@RunWith(SWTBotJunit4ClassRunner.class)
public class DawnEMFCreationWizardTest extends AbstractDawnEMFTest
{
+ private String resourceFieldLabel = org.eclipse.emf.cdo.dawn.ui.messages.Messages.DawnCreateNewResourceWizardPage_6;
+
@Test
public void testCreateNewDawnAcoreEditor() throws Exception
{
@@ -82,7 +84,7 @@ public class DawnEMFCreationWizardTest extends AbstractDawnEMFTest
shell = getBot().shell("New");
shell.activate();
- SWTBotText fileSemanticNameLabel = getBot().textWithLabel("File name:");
+ SWTBotText fileSemanticNameLabel = getBot().textWithLabel(resourceFieldLabel);
fileSemanticNameLabel.setText("test.acore");
assertEquals("test.acore", fileSemanticNameLabel.getText());
@@ -112,7 +114,7 @@ public class DawnEMFCreationWizardTest extends AbstractDawnEMFTest
shell = getBot().shell("New");
shell.activate();
- SWTBotText fileSemanticNameLabel = getBot().textWithLabel("File name:");
+ SWTBotText fileSemanticNameLabel = getBot().textWithLabel(resourceFieldLabel);
SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
Keyboard keyboard = KeyboardFactory.getDefaultKeyboard(fileSemanticNameLabel.widget, null);
fileSemanticNameLabel.setFocus();
@@ -146,7 +148,7 @@ public class DawnEMFCreationWizardTest extends AbstractDawnEMFTest
shell = getBot().shell("New");
shell.activate();
- SWTBotText fileNameLabel = getBot().textWithLabel("File name:");
+ SWTBotText fileNameLabel = getBot().textWithLabel(resourceFieldLabel);
fileNameLabel.setText("test.acore");
SWTBotTree tree = getBot().tree(0);
@@ -193,7 +195,7 @@ public class DawnEMFCreationWizardTest extends AbstractDawnEMFTest
shell = getBot().shell("New");
shell.activate();
- SWTBotText fileNameLabel = getBot().textWithLabel("File name:");
+ SWTBotText fileNameLabel = getBot().textWithLabel(resourceFieldLabel);
fileNameLabel.setText("test.acore");
SWTBotText folder = getBot().textWithLabel("Enter or select the parent folder: ");
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
index 9b54f76fd0..38fc52f8d9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
@@ -81,6 +81,8 @@ public class DawnAcoreTestUtil
private static IViewProvider viewProvider = new AcoreViewProvider();
+ private static String resourceFieldLabel = org.eclipse.emf.cdo.dawn.ui.messages.Messages.DawnCreateNewResourceWizardPage_6;
+
public static SWTBotGefEditor openNewAcoreGMFEditor(String diagramResourceName, SWTGefBot bot)
{
bot.menu("File").menu("New").menu("Other...").click();
@@ -132,7 +134,7 @@ public class DawnAcoreTestUtil
shell = bot.shell("New");
shell.activate();
- SWTBotText fileSemanticNameLabel = bot.textWithLabel("File name:");
+ SWTBotText fileSemanticNameLabel = bot.textWithLabel(resourceFieldLabel);
fileSemanticNameLabel.setText(resourceName);
bot.button("Next >").click();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
index 93da085857..7a920c3c5a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
@@ -41,6 +41,8 @@ public class DawnEcoreTestUtil
public static final String CREATION_WIZARD_NAME_EMF = "Dawn Ecore Model";
+ private static String resourceFieldLabel = org.eclipse.emf.cdo.dawn.ui.messages.Messages.DawnCreateNewResourceWizardPage_6;
+
public static SWTBotGefEditor openNewEcoreGMFEditor(String diagramResourceName, SWTGefBot bot)
{
bot.menu("File").menu("New").menu("Other...").click();
@@ -92,7 +94,7 @@ public class DawnEcoreTestUtil
shell = bot.shell("New");
shell.activate();
- SWTBotText fileSemanticNameLabel = bot.textWithLabel("File name:");
+ SWTBotText fileSemanticNameLabel = bot.textWithLabel(resourceFieldLabel);
fileSemanticNameLabel.setText(resourceName);
bot.button("Next >").click();

Back to the top