summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2010-10-21 03:43:09 (EDT)
committerSteffen Kriese2010-10-21 03:43:09 (EDT)
commit2601b095157f1c6a265c30cc3eaf6842cdbef3d1 (patch)
tree541b92ed631abfa2f0efe307acc8c3ce94d3cb9b
parent0ce5e02a701fda4c03e937acb25b714ee9b105e4 (diff)
downloadorg.eclipse.riena-2601b095157f1c6a265c30cc3eaf6842cdbef3d1.zip
org.eclipse.riena-2601b095157f1c6a265c30cc3eaf6842cdbef3d1.tar.gz
org.eclipse.riena-2601b095157f1c6a265c30cc3eaf6842cdbef3d1.tar.bz2
Renamed badly named tests
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/CheckTestConstraintsTest.java4
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractSWTRidgetTest.java4
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidget2Test.java (renamed from org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidgetTest2.java)2
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidgetTest.java2
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidget2Test.java (renamed from org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetTest2.java)2
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetTest.java2
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessor2Test.java (renamed from org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest2.java)6
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java2
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/ui/ridgets/marker/StatuslineMessageMarkerViewer2Test.java (renamed from org.eclipse.riena.tests/src/org/eclipse/riena/ui/ridgets/marker/StatuslineMessageMarkerViewerTest2.java)2
9 files changed, 12 insertions, 14 deletions
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/CheckTestConstraintsTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/CheckTestConstraintsTest.java
index 671e489..6394332 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/CheckTestConstraintsTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/CheckTestConstraintsTest.java
@@ -36,8 +36,6 @@ public class CheckTestConstraintsTest extends TestCase {
assertEquals(unmarked.size() + " unmarked test(s) found: " + unmarked, 0, unmarked.size());
}
- // FIXME: There are currently two test cases that violate this constraint.
- // We should fix that and set the expected count to zero!
public void testBadlyNamedTests() {
final List<Class<? extends TestCase>> badlyNamed = TestCollector.collectBadlyNamed(Activator.getDefault()
.getBundle(), null);
@@ -47,7 +45,7 @@ public class CheckTestConstraintsTest extends TestCase {
System.err.println(" badly named: " + testCase.getName());
}
}
- assertEquals(badlyNamed.size() + " badly named test(s) found: " + badlyNamed, 2, badlyNamed.size());
+ assertEquals(badlyNamed.size() + " badly named test(s) found: " + badlyNamed, 0, badlyNamed.size());
}
}
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractSWTRidgetTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractSWTRidgetTest.java
index ddf6d77..097ef8a 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractSWTRidgetTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractSWTRidgetTest.java
@@ -224,8 +224,8 @@ public abstract class AbstractSWTRidgetTest extends AbstractRidgetTestCase {
/**
* As per Bug 327496.
*
- * @see TextRidgetTest2#testToggleMandatoryMarkerWithMarkerHidingOn()
- * @see TextRidgetTest2#testToggleMarkerHidingWithMandatoryMarkerOn()
+ * @see TextRidget2Test#testToggleMandatoryMarkerWithMarkerHidingOn()
+ * @see TextRidget2Test#testToggleMarkerHidingWithMandatoryMarkerOn()
*/
@SuppressWarnings("unchecked")
public void testHideAndUnhideMarkers() {
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidgetTest2.java b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidget2Test.java
index 52ad2f4..2cc266a 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidgetTest2.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidget2Test.java
@@ -65,7 +65,7 @@ import org.eclipse.riena.ui.swt.utils.SwtUtilities;
*
* @see TextRidgetTest
*/
-public class TextRidgetTest2 extends AbstractSWTRidgetTest {
+public class TextRidget2Test extends AbstractSWTRidgetTest {
private final static String TEXT_ONE = "TestText1";
private final static String TEXT_TWO = "TestText2";
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidgetTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidgetTest.java
index 1ab7796..a2e5996 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidgetTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidgetTest.java
@@ -26,7 +26,7 @@ import org.eclipse.riena.ui.ridgets.swt.uibinding.SwtControlRidgetMapper;
/**
* Tests for the class {@link TextRidget}.
*
- * @see TextRidgetTest2
+ * @see TextRidget2Test
*/
public class TextRidgetTest extends AbstractSWTRidgetTest {
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetTest2.java b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidget2Test.java
index f8db571..0f524c4 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetTest2.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidget2Test.java
@@ -50,7 +50,7 @@ import org.eclipse.riena.ui.tests.base.TestSingleSelectionBean;
*
* @see TableRidgetTest
*/
-public class TreeRidgetTest2 extends AbstractSWTRidgetTest {
+public class TreeRidget2Test extends AbstractSWTRidgetTest {
protected ITreeNode root;
protected ITreeNode rootChild1;
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetTest.java
index 6a10a93..acde223 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetTest.java
@@ -33,7 +33,7 @@ import org.eclipse.riena.ui.ridgets.tree2.TreeNode;
* These tests use a TreeNode that wraps a String and focus on methods from the
* {@link ITreeRidget}.
*
- * @see TreeRidgetTest2
+ * @see TreeRidget2Test
*/
public class TreeRidgetTest extends AbstractSWTRidgetTest {
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest2.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessor2Test.java
index 2ff292c..aa545a7 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest2.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessor2Test.java
@@ -25,7 +25,7 @@ import org.eclipse.riena.navigation.model.NavigationProcessorTest.TestSubModuleN
* Manual Tests for the NavigationProcessor that use addPluginXml.
*/
@NonUITestCase
-public class NavigationProcessorTest2 extends RienaTestCase {
+public class NavigationProcessor2Test extends RienaTestCase {
private static final String TARGET_MODULE_GROUP = "org.eclipse.riena.navigation.model.test.moduleGroup.2";
private NavigationProcessor navigationProcessor;
@@ -90,7 +90,7 @@ public class NavigationProcessorTest2 extends RienaTestCase {
assertEquals(1, applicationNode.getChildren().size());
assertTrue(subApplication.isActivated());
- addPluginXml(NavigationProcessorTest2.class, "NavigationProcessorTest.xml", 500);
+ addPluginXml(NavigationProcessor2Test.class, "NavigationProcessorTest.xml", 500);
try {
subModule1.navigate(new NavigationNodeId("org.eclipse.riena.navigation.model.test.secondModuleGroup"));
@@ -141,7 +141,7 @@ public class NavigationProcessorTest2 extends RienaTestCase {
"org.eclipse.riena.navigation.model.test.subModule"), null);
assertEquals(subModule1, targetNode);
- addPluginXml(NavigationProcessorTest2.class, "NavigationProcessorTest.xml", 1000);
+ addPluginXml(NavigationProcessor2Test.class, "NavigationProcessorTest.xml", 1000);
try {
targetNode = navigationProcessor.create(applicationNode, new NavigationNodeId(
"org.eclipse.riena.navigation.model.test.secondModuleGroup"), null);
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java
index 16ad117..2284142 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/navigation/model/NavigationProcessorTest.java
@@ -41,7 +41,7 @@ import org.eclipse.riena.ui.ridgets.IRidget;
* NavigationProcessor that don't use addPluginXml() and can be run on the
* buildserver.
* <p>
- * FIXME move all tests from {@link NavigationProcessorTest2} over here
+ * FIXME move all tests from {@link NavigationProcessor2Test} over here
* again, when the addPluginXml() issue is fixed.
*/
@NonUITestCase
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/ui/ridgets/marker/StatuslineMessageMarkerViewerTest2.java b/org.eclipse.riena.tests/src/org/eclipse/riena/ui/ridgets/marker/StatuslineMessageMarkerViewer2Test.java
index 1f757f1..3ca73ae 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/ui/ridgets/marker/StatuslineMessageMarkerViewerTest2.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/ui/ridgets/marker/StatuslineMessageMarkerViewer2Test.java
@@ -17,7 +17,7 @@ import org.eclipse.riena.ui.ridgets.IStatuslineRidget;
* swt-controls for testing.
*/
@NonUITestCase
-public class StatuslineMessageMarkerViewerTest2 extends RienaTestCase {
+public class StatuslineMessageMarkerViewer2Test extends RienaTestCase {
private static final String MESSAGE = "message";
private StatuslineMessageMarkerViewerUnderTest viewer;