From 68f3f710c1f99a54661befb9b764095d21a0a39a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Wed, 12 Jan 2022 23:59:12 +0100 Subject: [PATCH] minor --- .../newWizard/NewTaxonWizardTest.java | 21 +++++++++---------- .../AbstractSelectionElementTest.java | 19 ++++++++++------- .../ClassificationSelectionElementTest.java | 12 ++++++++--- .../selection/NameSelectionElementTest.java | 14 +++++++++---- .../TaxonNodeSelectionElementTest.java | 9 ++++++-- .../selection/TaxonSelectionElementTest.java | 9 ++++++-- .../etaxonomy/taxeditor/util/H2DbSupport.java | 12 ++++++++--- 7 files changed, 63 insertions(+), 33 deletions(-) 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 a1ac7615f..89fbcb32b 100644 --- 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,12 +1,16 @@ /** - * - */ +* Copyright (C) 2015 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.taxeditor.newWizard; -import junit.framework.Assert; - -import org.eclipse.swtbot.eclipse.finder.waits.Conditions; +import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -14,7 +18,6 @@ import eu.etaxonomy.taxeditor.test.AbstractEditorTest; /** * @author n.hoffmann - * */ @Ignore public class NewTaxonWizardTest extends AbstractEditorTest { @@ -50,8 +53,4 @@ public class NewTaxonWizardTest extends AbstractEditorTest { // bot.waitUntil(Conditions.waitForEditor(WithPartId.withPartId(MultiPageTaxonEditor.ID))); // Assert.assertEquals(newTaxonName, bot.activeEditor().getTitle()); } - - - - -} +} \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElementTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElementTest.java index adccccfe3..46f922715 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElementTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElementTest.java @@ -1,6 +1,11 @@ /** - * - */ +* Copyright (C) 2015 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.taxeditor.ui.selection; import org.junit.After; @@ -8,20 +13,18 @@ import org.junit.After; import eu.etaxonomy.taxeditor.test.AbstractEditorTest; /** - * This test will only test the selection element itself. The test may have to start other - * dialogs open windows before to get at the selection element. Any errors on the way + * This test will only test the selection element itself. The test may have to start other + * dialogs open windows before to get at the selection element. Any errors on the way * should be handled by different tests. - * + * * @author n.hoffmann * */ public abstract class AbstractSelectionElementTest extends AbstractEditorTest{ - - @After public void tearDown() { utils.cancel(); } - + } 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 233cd8127..6bb2f2df4 100644 --- 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,6 +1,11 @@ /** - * - */ +* Copyright (C) 2015 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.taxeditor.ui.selection; import org.eclipse.swtbot.eclipse.finder.waits.Conditions; @@ -17,7 +22,8 @@ import org.junit.Test; */ @Ignore public class ClassificationSelectionElementTest extends AbstractSelectionElementTest{ - @Override + + @Override public void setup() { super.setup(); bot.menu("General").menu("New").menu("Taxon").click(); 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 1f1badc2c..da607b5c6 100644 --- 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,9 +1,14 @@ /** - * - */ +* Copyright (C) 2015 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.taxeditor.ui.selection; -import org.eclipse.swtbot.eclipse.finder.waits.Conditions; +import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.junit.Ignore; import org.junit.Test; @@ -13,7 +18,8 @@ import org.junit.Test; */ @Ignore public class NameSelectionElementTest extends AbstractSelectionElementTest { - @Override + + @Override public void setup() { super.setup(); bot.menu("General").menu("New").menu("Taxon").click(); 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 16697a485..89c6f0164 100644 --- 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,6 +1,11 @@ /** - * - */ +* Copyright (C) 2015 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.taxeditor.ui.selection; import org.eclipse.swtbot.eclipse.finder.waits.Conditions; 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 fef3859f6..e5a2a9880 100644 --- 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,6 +1,11 @@ /** - * - */ +* Copyright (C) 2015 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.taxeditor.ui.selection; import org.eclipse.swtbot.eclipse.finder.waits.Conditions; diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/util/H2DbSupport.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/util/H2DbSupport.java index 2dddbf52e..9f4f14029 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/util/H2DbSupport.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/util/H2DbSupport.java @@ -1,17 +1,23 @@ +/** +* Copyright (C) 2015 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ package eu.etaxonomy.taxeditor.util; /** * based on from http://code.google.com/p/java-tester/source/browse/trunk/src/main/java/org/jtester/unitils/database/H2DbSupport.java */ - - import java.util.Set; import org.unitils.core.dbsupport.DbSupport; public class H2DbSupport extends DbSupport { /** - * Creates support for HsqlDb databases. + * Creates support for H2 databases. */ public H2DbSupport() { super("h2"); -- 2.34.1