svn commit: r12725 - trunk/tests/org/argouml: model uml/diagram/state/ui

Author: tfmorris
Date: 2007-05-30 12:02:13-0700
New Revision: 12725

Modified:
   trunk/tests/org/argouml/model/TestCoreFactory.java
   trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java

Log:
Clean up compiler warnings and Javadoc

Modified: trunk/tests/org/argouml/model/TestCoreFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/model/TestCoreFactory.java?view=diff&rev=12725&p1=trunk/tests/org/argouml/model/TestCoreFactory.java&p2=trunk/tests/org/argouml/model/TestCoreFactory.java&r1=12724&r2=12725
==============================================================================
--- trunk/tests/org/argouml/model/TestCoreFactory.java	(original)
+++ trunk/tests/org/argouml/model/TestCoreFactory.java	2007-05-30 12:02:13-0700
@@ -484,9 +484,13 @@
         
         // A parameterized class can only be the client of a single binding
         try {
-            Object binding2 = Model.getCoreFactory().buildBinding(parameterizedClass,
-                    Model.getCoreFactory().buildClass("Template2", model), null);
-            fail("Attempt to create 2nd binding for a client didn't fail as expected.");
+            Model.getCoreFactory()
+                    .buildBinding(
+                            parameterizedClass,
+                            Model.getCoreFactory().buildClass(
+                                    "Template2", model), null);
+            fail("Attempt to create 2nd binding for a client didn't fail "
+                    + "as expected.");
         } catch (IllegalArgumentException e) {
             // exception expected - test success
         }
@@ -497,7 +501,7 @@
         
         args.remove(0);
         try {
-            Object binding2 = Model.getCoreFactory().buildBinding(
+            Model.getCoreFactory().buildBinding(
                     parameterizedClass2, templatedClass, args);
             fail("Expected exception for mismatched number of args & params");
         } catch (IllegalArgumentException e) {
@@ -506,9 +510,10 @@
 
         args.add(arg1);
         try {
-            Object binding2 = Model.getCoreFactory().buildBinding(
+            Model.getCoreFactory().buildBinding(
                     parameterizedClass2, templatedClass, args);
-            fail("Expected exception for mismatched type/order of args & params");
+            fail("Expected exception for mismatched type/order of args "
+                    + "& params");
         } catch (IllegalArgumentException e) {
             // expected - test success
         }

Modified: trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java?view=diff&rev=12725&p1=trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java&p2=trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java&r1=12724&r2=12725
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java	(original)
+++ trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java	2007-05-30 12:02:13-0700
@@ -45,6 +45,7 @@
     /*
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     public void setUp() throws Exception {
 	super.setUp();
         InitializeModel.initializeDefault();
@@ -55,9 +56,8 @@
      */
     public void testBranchStateClonable() {
 	FigBranchState fig = new FigBranchState();
-	FigBranchState figclone;
-
-	figclone = (FigBranchState) fig.clone();
+	FigBranchState figClone = (FigBranchState) fig.clone();
+        assertNotNull(figClone);
     }
 
     /**
@@ -65,9 +65,8 @@
      */
     public void testCompositeStateClonable() {
 	FigCompositeState fig = new FigCompositeState();
-	FigCompositeState figclone;
-
-	figclone = (FigCompositeState) fig.clone();
+	FigCompositeState figClone = (FigCompositeState) fig.clone();
+        assertNotNull(figClone);
     }
 
     /**
@@ -75,9 +74,8 @@
      */
     public void testDeepHistoryStateClonable() {
 	FigDeepHistoryState fig = new FigDeepHistoryState();
-	FigDeepHistoryState figclone;
-
-	figclone = (FigDeepHistoryState) fig.clone();
+	FigDeepHistoryState figClone = (FigDeepHistoryState) fig.clone();
+        assertNotNull(figClone);
     }
 
     /**
@@ -85,9 +83,8 @@
      */
     public void testFinalStateClonable() {
 	FigFinalState fig = new FigFinalState();
-	FigFinalState figclone;
-
-	figclone = (FigFinalState) fig.clone();
+	FigFinalState figClone = (FigFinalState) fig.clone();
+        assertNotNull(figClone);
     }
 
 
@@ -96,9 +93,8 @@
      */
     public void testForkStateClonable() {
 	FigForkState fig = new FigForkState();
-	FigForkState figclone;
-
-	figclone = (FigForkState) fig.clone();
+	FigForkState figClone = (FigForkState) fig.clone();
+        assertNotNull(figClone);
     }
 
     /**
@@ -106,9 +102,8 @@
      */
     public void testInitialStateClonable() {
 	FigInitialState fig = new FigInitialState();
-	FigInitialState figclone;
-
-	figclone = (FigInitialState) fig.clone();
+	FigInitialState figClone = (FigInitialState) fig.clone();
+        assertNotNull(figClone);
     }
 
 
@@ -117,9 +112,8 @@
      */
     public void testJoinStateClonable() {
 	FigJoinState fig = new FigJoinState();
-	FigJoinState figclone;
-
-	figclone = (FigJoinState) fig.clone();
+	FigJoinState figClone = (FigJoinState) fig.clone();
+        assertNotNull(figClone);
     }
 
     /**
@@ -127,9 +121,8 @@
      */
     public void testShallowHistoryStateClonable() {
 	FigShallowHistoryState fig = new FigShallowHistoryState();
-	FigShallowHistoryState figclone;
-
-	figclone = (FigShallowHistoryState) fig.clone();
+	FigShallowHistoryState figClone = (FigShallowHistoryState) fig.clone();
+        assertNotNull(figClone);
     }
 
     /**
@@ -137,9 +130,8 @@
      */
     public void testSimpleStateClonable() {
 	FigSimpleState fig = new FigSimpleState();
-	FigSimpleState figclone;
-
-	figclone = (FigSimpleState) fig.clone();
+	FigSimpleState figClone = (FigSimpleState) fig.clone();
+        assertNotNull(figClone);
     }
 
 
@@ -148,9 +140,8 @@
      */
     public void testTransitionClonable() {
 	FigTransition fig = new FigTransition();
-	FigTransition figclone;
-
-	figclone = (FigTransition) fig.clone();
+	FigTransition figClone = (FigTransition) fig.clone();
+        assertNotNull(figClone);
     }