svn commit: r381273 - /jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/IfTest.java

[dion]

Author: dion
Date: Sun Feb 26 22:40:01 2006
New Revision: 381273

URL: http://svn.apache.org/viewcvs?rev=381273&view=rev
Log:
Simplify tests

Modified:
    
jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/IfTest.java

Modified: 
jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/IfTest.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/IfTest.java?rev=381273&r1=381272&r2=381273&view=diff
==============================================================================
--- 
jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/IfTest.java 
(original)
+++ 
jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/IfTest.java 
Sun Feb 26 22:40:01 2006
@@ -39,8 +39,6 @@
         JexlContext jc = JexlHelper.createContext();
 
         Object o = e.evaluate(jc);
-        assertNotNull("Return value is empty", o);
-        assertTrue("Result is not an integer", o instanceof Integer);
         assertEquals("Result is not 1", Integer.valueOf(1), o);
     }
 
@@ -68,8 +66,6 @@
         JexlContext jc = JexlHelper.createContext();
 
         Object o = e.evaluate(jc);
-        assertNotNull("Return value is empty", o);
-        assertTrue("Result is not an integer", o instanceof Integer);
         assertEquals("Result is not 2", Integer.valueOf(2), o);
     }
 
@@ -84,8 +80,6 @@
         JexlContext jc = JexlHelper.createContext();
 
         Object o = e.evaluate(jc);
-        assertNotNull("Return value is empty", o);
-        assertTrue("Result is not a String", o instanceof String);
         assertEquals("Result is wrong", "hello", o);
     }
 
@@ -100,8 +94,6 @@
         JexlContext jc = JexlHelper.createContext();
 
         Object o = e.evaluate(jc);
-        assertNotNull("Return value is empty", o);
-        assertTrue("Result is not an Integer", o instanceof Integer);
         assertEquals("Result is wrong", Integer.valueOf(2), o);
     }
 
@@ -117,8 +109,6 @@
         jc.getVars().put("x", Integer.valueOf(1));
 
         Object o = e.evaluate(jc);
-        assertNotNull("Return value is empty", o);
-        assertTrue("Result is not a boolean", o instanceof Boolean);
         assertEquals("Result is not true", Boolean.TRUE, o);
     }
 
@@ -134,8 +124,6 @@
         jc.getVars().put("x", Integer.valueOf(2));
 
         Object o = e.evaluate(jc);
-        assertNotNull("Return value is empty", o);
-        assertTrue("Result is not a boolean", o instanceof Boolean);
         assertEquals("Result is not true", Boolean.TRUE, o);
     }
 
@@ -151,8 +139,6 @@
         jc.getVars().put("x", Float.valueOf(2.5f));
 
         Object o = e.evaluate(jc);
-        assertNotNull("Return value is empty", o);
-        assertTrue("Result is not a boolean", o instanceof Boolean);
         assertEquals("Result is not true", Boolean.TRUE, o);
     }
 
@@ -171,5 +157,4 @@
         Object result = jc.getVars().get("y");
         assertEquals("y has the wrong value", Integer.valueOf(1), result);
     }
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]