BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b3523e3
)
reset swtbot dependencies and set all swtbot tests to ignore for the moment
author
Cherian Mathew
<c.mathew@bgbm.org>
Wed, 3 Jun 2015 12:38:20 +0000
(14:38 +0200)
committer
Cherian Mathew
<c.mathew@bgbm.org>
Wed, 3 Jun 2015 12:38:20 +0000
(14:38 +0200)
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
patch
|
blob
|
history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/application/menu/general/NewMenuTest.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/navigation/navigator/contextmenu/ClassificationTest.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizardTest.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialogTest.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElementTest.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 2b302260300a04691aefa41459dafee45f7aa15d..89776c1ef1ea0a34745cc89a03ae73d4eb98fb22 100644
(file)
--- a/
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@
-17,8
+17,11
@@
Require-Bundle: org.eclipse.ui,
eu.etaxonomy.taxeditor.navigation,
eu.etaxonomy.taxeditor.printpublisher,
eu.etaxonomy.taxeditor.store,
eu.etaxonomy.taxeditor.navigation,
eu.etaxonomy.taxeditor.printpublisher,
eu.etaxonomy.taxeditor.store,
- org.apache.log4j
-Eclipse-RegisterBuddy: org.apache.log4j
+ org.apache.log4j,
+ org.hamcrest,
+ org.eclipse.swtbot.eclipse.core,
+ org.eclipse.swtbot.eclipse.finder
+Eclipse-RegisterBuddy: org.apache.log4j, org.eclipse.swtbot.swt.finder
Bundle-ClassPath: .,
lib/byte-buddy-0.5.1.jar,
lib/org.springframework.context-3.2.2.RELEASE.jar,
Bundle-ClassPath: .,
lib/byte-buddy-0.5.1.jar,
lib/org.springframework.context-3.2.2.RELEASE.jar,
@@
-28,3
+31,4
@@
Bundle-ClassPath: .,
lib/unitils-dbunit-3.4.2.jar,
lib/unitils-spring-3.4.2.jar,
lib/dbunit-2.4.9.jar
lib/unitils-dbunit-3.4.2.jar,
lib/unitils-spring-3.4.2.jar,
lib/dbunit-2.4.9.jar
+Export-Package: org.hamcrest
diff --git
a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/application/menu/general/NewMenuTest.java
b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/application/menu/general/NewMenuTest.java
index 0dc9065267426971ed1f9a6f79b42a9dd61050a6..982e8cee3ba46fccd7e8aae66cf70deebfb23b62 100644
(file)
--- a/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/application/menu/general/NewMenuTest.java
+++ b/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/application/menu/general/NewMenuTest.java
@@
-1,16
+1,18
@@
package eu.etaxonomy.taxeditor.application.menu.general;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
package eu.etaxonomy.taxeditor.application.menu.general;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
+import org.junit.Ignore;
\r
import org.junit.Test;
\r
\r
import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
\r
\r
/**
\r
* Open all "General -> New" menus
\r
import org.junit.Test;
\r
\r
import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
\r
\r
/**
\r
* Open all "General -> New" menus
\r
- *
\r
+ *
\r
* @author n.hoffmann
\r
*
\r
*/
\r
* @author n.hoffmann
\r
*
\r
*/
\r
+@Ignore
\r
public class NewMenuTest extends AbstractEditorTest {
\r
\r
@Test
\r
public class NewMenuTest extends AbstractEditorTest {
\r
\r
@Test
\r
@@
-18,42
+20,42
@@
public class NewMenuTest extends AbstractEditorTest {
openNewWizardFor("Taxon");
\r
utils.cancel();
\r
}
\r
openNewWizardFor("Taxon");
\r
utils.cancel();
\r
}
\r
-
\r
+
\r
\r
@Test
\r
public void canOpenNewWizardForReference(){
\r
openNewWizardFor("Reference");
\r
utils.cancel();
\r
}
\r
\r
@Test
\r
public void canOpenNewWizardForReference(){
\r
openNewWizardFor("Reference");
\r
utils.cancel();
\r
}
\r
-
\r
-
\r
+
\r
+
\r
@Test
\r
public void canOpenNewWizardForName(){
\r
openNewWizardFor("Name");
\r
utils.cancel();
\r
}
\r
@Test
\r
public void canOpenNewWizardForName(){
\r
openNewWizardFor("Name");
\r
utils.cancel();
\r
}
\r
-
\r
-
\r
+
\r
+
\r
@Test
\r
public void canOpenNewWizardForTeam(){
\r
openNewWizardFor("Team");
\r
utils.cancel();
\r
}
\r
@Test
\r
public void canOpenNewWizardForTeam(){
\r
openNewWizardFor("Team");
\r
utils.cancel();
\r
}
\r
-
\r
-
\r
+
\r
+
\r
@Test
\r
public void canOpenNewWizardForPerson(){
\r
openNewWizardFor("Person");
\r
utils.cancel();
\r
}
\r
@Test
\r
public void canOpenNewWizardForPerson(){
\r
openNewWizardFor("Person");
\r
utils.cancel();
\r
}
\r
-
\r
+
\r
@Test
\r
public void canOpenNewWizardForSpecimen(){
\r
openNewWizardFor("Specimen");
\r
utils.cancel();
\r
}
\r
@Test
\r
public void canOpenNewWizardForSpecimen(){
\r
openNewWizardFor("Specimen");
\r
utils.cancel();
\r
}
\r
-
\r
-
\r
+
\r
+
\r
@Test
\r
public void canOpenNewWizardForClassification(){
\r
openNewWizardFor("Classification");
\r
@Test
\r
public void canOpenNewWizardForClassification(){
\r
openNewWizardFor("Classification");
\r
diff --git
a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/navigation/navigator/contextmenu/ClassificationTest.java
b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/navigation/navigator/contextmenu/ClassificationTest.java
index 6d4dac58c945cd11c6a03da2b499e8f444c74bdd..30894688668fbbf03557a7a9c2adc44bc2a75c85 100644
(file)
--- a/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/navigation/navigator/contextmenu/ClassificationTest.java
+++ b/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/navigation/navigator/contextmenu/ClassificationTest.java
@@
-1,5
+1,5
@@
/**
\r
/**
\r
- *
\r
+ *
\r
*/
\r
package eu.etaxonomy.taxeditor.navigation.navigator.contextmenu;
\r
\r
*/
\r
package eu.etaxonomy.taxeditor.navigation.navigator.contextmenu;
\r
\r
@@
-7,6
+7,7
@@
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
\r
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
\r
import org.junit.Before;
\r
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
\r
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
\r
import org.junit.Before;
\r
+import org.junit.Ignore;
\r
import org.junit.Test;
\r
\r
import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
\r
import org.junit.Test;
\r
\r
import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
\r
@@
-16,18
+17,20
@@
import eu.etaxonomy.taxeditor.test.ContextMenuHelper;
* @author n.hoffmann
\r
*
\r
*/
\r
* @author n.hoffmann
\r
*
\r
*/
\r
+@Ignore
\r
public class ClassificationTest extends AbstractEditorTest {
\r
\r
private SWTBotView navigatorView;
\r
private SWTBotTree tree;
\r
\r
public class ClassificationTest extends AbstractEditorTest {
\r
\r
private SWTBotView navigatorView;
\r
private SWTBotTree tree;
\r
\r
- @Before
\r
+ @Override
\r
+ @Before
\r
public void setup() {
\r
super.setup();
\r
navigatorView = utils.view("Taxon Navigator");
\r
tree = utils.tree(navigatorView.getWidget());
\r
}
\r
public void setup() {
\r
super.setup();
\r
navigatorView = utils.view("Taxon Navigator");
\r
tree = utils.tree(navigatorView.getWidget());
\r
}
\r
-
\r
+
\r
@Test
\r
public void canDeleteClassification() throws Exception {
\r
tree.select(0);
\r
@Test
\r
public void canDeleteClassification() throws Exception {
\r
tree.select(0);
\r
@@
-35,7
+38,7
@@
public class ClassificationTest extends AbstractEditorTest {
bot.waitUntil(Conditions.shellIsActive("Confirm Deletion"));
\r
utils.ok();
\r
}
\r
bot.waitUntil(Conditions.shellIsActive("Confirm Deletion"));
\r
utils.ok();
\r
}
\r
-
\r
+
\r
@Test
\r
public void canCreateClassification() throws Exception {
\r
tree.setFocus();
\r
@Test
\r
public void canCreateClassification() throws Exception {
\r
tree.setFocus();
\r
diff --git
a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizardTest.java
b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizardTest.java
index 1c09585e59be2c4430efb79702a1dacb86a46923..a1ac7615f6ef58f582b6190a36fea3275e0a797c 100644
(file)
--- a/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizardTest.java
+++ b/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizardTest.java
@@
-1,5
+1,5
@@
/**
\r
/**
\r
- *
\r
+ *
\r
*/
\r
package eu.etaxonomy.taxeditor.newWizard;
\r
\r
*/
\r
package eu.etaxonomy.taxeditor.newWizard;
\r
\r
@@
-7,6
+7,7
@@
import junit.framework.Assert;
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
\r
+import org.junit.Ignore;
\r
import org.junit.Test;
\r
\r
import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
\r
import org.junit.Test;
\r
\r
import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
\r
@@
-15,6
+16,7
@@
import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
* @author n.hoffmann
\r
*
\r
*/
\r
* @author n.hoffmann
\r
*
\r
*/
\r
+@Ignore
\r
public class NewTaxonWizardTest extends AbstractEditorTest {
\r
\r
@Override
\r
public class NewTaxonWizardTest extends AbstractEditorTest {
\r
\r
@Override
\r
@@
-23,14
+25,14
@@
public class NewTaxonWizardTest extends AbstractEditorTest {
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
-
\r
+
\r
@Test
\r
public void unalteredDialogCanNotBefinished() {
\r
boolean finishIsEnabled = bot.button("Finish").isEnabled();
\r
Assert.assertEquals(false, finishIsEnabled);
\r
utils.cancel();
\r
}
\r
@Test
\r
public void unalteredDialogCanNotBefinished() {
\r
boolean finishIsEnabled = bot.button("Finish").isEnabled();
\r
Assert.assertEquals(false, finishIsEnabled);
\r
utils.cancel();
\r
}
\r
-
\r
+
\r
@Test
\r
public void canCreateNewTaxonMinimal(){
\r
utils.openFilteredSelection(0, "Choose a Classification");
\r
@Test
\r
public void canCreateNewTaxonMinimal(){
\r
utils.openFilteredSelection(0, "Choose a Classification");
\r
@@
-44,12
+46,12
@@
public class NewTaxonWizardTest extends AbstractEditorTest {
bot.textWithLabel("New Taxon").setText(newTaxonName);
\r
bot.waitUntil(Conditions.widgetIsEnabled(bot.button("Finish")));
\r
utils.finish();
\r
bot.textWithLabel("New Taxon").setText(newTaxonName);
\r
bot.waitUntil(Conditions.widgetIsEnabled(bot.button("Finish")));
\r
utils.finish();
\r
-
\r
+
\r
// bot.waitUntil(Conditions.waitForEditor(WithPartId.withPartId(MultiPageTaxonEditor.ID)));
\r
// Assert.assertEquals(newTaxonName, bot.activeEditor().getTitle());
\r
}
\r
// bot.waitUntil(Conditions.waitForEditor(WithPartId.withPartId(MultiPageTaxonEditor.ID)));
\r
// Assert.assertEquals(newTaxonName, bot.activeEditor().getTitle());
\r
}
\r
-
\r
-
\r
\r
\r
-
\r
+
\r
+
\r
+
\r
}
\r
}
\r
diff --git
a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialogTest.java
b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialogTest.java
index 2905ba58ba38a88f2a32a1ddd41ec7459080f8b7..786f1fd2490e62896f91f0694ac10d05705b1416 100644
(file)
--- a/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialogTest.java
+++ b/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialogTest.java
@@
-1,13
+1,14
@@
package eu.etaxonomy.taxeditor.ui.dialogs;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
package eu.etaxonomy.taxeditor.ui.dialogs;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
+import org.junit.Ignore;
\r
import org.junit.Test;
\r
\r
import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
\r
\r
import org.junit.Test;
\r
\r
import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
\r
\r
-
\r
+@Ignore
\r
public class LoginDialogTest extends AbstractEditorTest{
\r
public class LoginDialogTest extends AbstractEditorTest{
\r
-
\r
+
\r
@Test
\r
public void canLoginAsAdmin() throws Exception {
\r
bot.menu("General").menu("Login").click();
\r
@Test
\r
public void canLoginAsAdmin() throws Exception {
\r
bot.menu("General").menu("Login").click();
\r
@@
-16,12
+17,12
@@
public class LoginDialogTest extends AbstractEditorTest{
bot.textWithLabel("Password").setText("00000");
\r
utils.ok();
\r
}
\r
bot.textWithLabel("Password").setText("00000");
\r
utils.ok();
\r
}
\r
-
\r
+
\r
@Test
\r
public void canCancelLogin() throws Exception {
\r
bot.menu("General").menu("Login").click();
\r
bot.waitUntil(Conditions.shellIsActive("Login"));
\r
utils.cancel();
\r
}
\r
@Test
\r
public void canCancelLogin() throws Exception {
\r
bot.menu("General").menu("Login").click();
\r
bot.waitUntil(Conditions.shellIsActive("Login"));
\r
utils.cancel();
\r
}
\r
-
\r
+
\r
}
\r
}
\r
diff --git
a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java
b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java
index 245f93498c619b926cf4124710aa5026ab182868..233cd8127bf2f25099f3e8adc86d0004cfbc2a59 100644
(file)
--- a/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java
+++ b/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java
@@
-1,19
+1,21
@@
/**
\r
/**
\r
- *
\r
+ *
\r
*/
\r
package eu.etaxonomy.taxeditor.ui.selection;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
*/
\r
package eu.etaxonomy.taxeditor.ui.selection;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
+import org.junit.Ignore;
\r
import org.junit.Test;
\r
\r
/**
\r
import org.junit.Test;
\r
\r
/**
\r
- * This test will only test the selection element itself. The test may have to start other
\r
- * dialogs open windows before to get at the selection element. Any errors on the way
\r
+ * This test will only test the selection element itself. The test may have to start other
\r
+ * dialogs open windows before to get at the selection element. Any errors on the way
\r
* should be handled by different tests.
\r
* should be handled by different tests.
\r
- *
\r
+ *
\r
* @author n.hoffmann
\r
*
\r
*/
\r
* @author n.hoffmann
\r
*
\r
*/
\r
+@Ignore
\r
public class ClassificationSelectionElementTest extends AbstractSelectionElementTest{
\r
@Override
\r
public void setup() {
\r
public class ClassificationSelectionElementTest extends AbstractSelectionElementTest{
\r
@Override
\r
public void setup() {
\r
@@
-21,7
+23,7
@@
public class ClassificationSelectionElementTest extends AbstractSelectionElement
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
-
\r
+
\r
@Test
\r
public void canSelectClassification() {
\r
utils.openFilteredSelection(0, "Choose a Classification");
\r
@Test
\r
public void canSelectClassification() {
\r
utils.openFilteredSelection(0, "Choose a Classification");
\r
diff --git
a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java
b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java
index a8b653ca5c32cafd94f7fe9ebc313024ff076511..1f1badc2c7e28f91f3d2e228ef38a8cfd175b1fd 100644
(file)
--- a/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java
+++ b/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java
@@
-1,15
+1,17
@@
/**
\r
/**
\r
- *
\r
+ *
\r
*/
\r
package eu.etaxonomy.taxeditor.ui.selection;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
*/
\r
package eu.etaxonomy.taxeditor.ui.selection;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
+import org.junit.Ignore;
\r
import org.junit.Test;
\r
\r
/**
\r
* @author n.hoffmann
\r
*
\r
*/
\r
import org.junit.Test;
\r
\r
/**
\r
* @author n.hoffmann
\r
*
\r
*/
\r
+@Ignore
\r
public class NameSelectionElementTest extends AbstractSelectionElementTest {
\r
@Override
\r
public void setup() {
\r
public class NameSelectionElementTest extends AbstractSelectionElementTest {
\r
@Override
\r
public void setup() {
\r
@@
-17,7
+19,7
@@
public class NameSelectionElementTest extends AbstractSelectionElementTest {
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
-
\r
+
\r
@Test
\r
public void canSelectName() {
\r
utils.openFilteredSelection(3, "Choose a name");
\r
@Test
\r
public void canSelectName() {
\r
utils.openFilteredSelection(3, "Choose a name");
\r
diff --git
a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java
b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java
index 2b29c873906e4a5a1a951daef1a3a6c82d8cca10..16697a4857268e186a3407d59b5dc259216e67b3 100644
(file)
--- a/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java
+++ b/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java
@@
-1,15
+1,17
@@
/**
\r
/**
\r
- *
\r
+ *
\r
*/
\r
package eu.etaxonomy.taxeditor.ui.selection;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
*/
\r
package eu.etaxonomy.taxeditor.ui.selection;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
+import org.junit.Ignore;
\r
import org.junit.Test;
\r
\r
/**
\r
* @author n.hoffmann
\r
*
\r
*/
\r
import org.junit.Test;
\r
\r
/**
\r
* @author n.hoffmann
\r
*
\r
*/
\r
+@Ignore
\r
public class TaxonNodeSelectionElementTest extends AbstractSelectionElementTest {
\r
@Override
\r
public void setup() {
\r
public class TaxonNodeSelectionElementTest extends AbstractSelectionElementTest {
\r
@Override
\r
public void setup() {
\r
@@
-17,11
+19,11
@@
public class TaxonNodeSelectionElementTest extends AbstractSelectionElementTest
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
-
\r
+
\r
@Test
\r
public void canSelectTaxon() {
\r
utils.openFilteredSelection(1, "Select parent taxon");
\r
utils.cancel();
\r
}
\r
@Test
\r
public void canSelectTaxon() {
\r
utils.openFilteredSelection(1, "Select parent taxon");
\r
utils.cancel();
\r
}
\r
-
\r
+
\r
}
\r
}
\r
diff --git
a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElementTest.java
b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElementTest.java
index af84076b888edb7f4d49549cdc01ad657d2ca6c4..fef3859f671d184031b2fee83fc7c9882e015722 100644
(file)
--- a/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElementTest.java
+++ b/
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElementTest.java
@@
-1,19
+1,21
@@
/**
\r
/**
\r
- *
\r
+ *
\r
*/
\r
package eu.etaxonomy.taxeditor.ui.selection;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
*/
\r
package eu.etaxonomy.taxeditor.ui.selection;
\r
\r
import org.eclipse.swtbot.eclipse.finder.waits.Conditions;
\r
+import org.junit.Ignore;
\r
import org.junit.Test;
\r
\r
/**
\r
import org.junit.Test;
\r
\r
/**
\r
- * This test will only test the selection element itself. The test may have to start other
\r
- * dialogs open windows before to get at the selection element. Any errors on the way
\r
+ * This test will only test the selection element itself. The test may have to start other
\r
+ * dialogs open windows before to get at the selection element. Any errors on the way
\r
* should be handled by different tests.
\r
* should be handled by different tests.
\r
- *
\r
+ *
\r
* @author n.hoffmann
\r
*
\r
*/
\r
* @author n.hoffmann
\r
*
\r
*/
\r
+@Ignore
\r
public class TaxonSelectionElementTest extends AbstractSelectionElementTest {
\r
@Override
\r
public void setup() {
\r
public class TaxonSelectionElementTest extends AbstractSelectionElementTest {
\r
@Override
\r
public void setup() {
\r
@@
-21,7
+23,7
@@
public class TaxonSelectionElementTest extends AbstractSelectionElementTest {
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
bot.menu("General").menu("New").menu("Taxon").click();
\r
bot.waitUntil(Conditions.shellIsActive("New Entity"));
\r
}
\r
-
\r
+
\r
@Test
\r
public void canSelectTaxon() {
\r
utils.openFilteredSelection(2, "Choose a taxon");
\r
@Test
\r
public void canSelectTaxon() {
\r
utils.openFilteredSelection(2, "Choose a taxon");
\r