[jboss-cvs] jboss-seam/src/test/misc/org/jboss/seam/test ...

[Gavin King]

  User: gavin   
  Date: 06/10/25 11:37:36

  Modified:    src/test/misc/org/jboss/seam/test      Foo.java
                        MethodExpressionParserTest.java PageflowTest.java
                        PhaseListenerTest.java RemotingTest.java
  Log:
  many minor
  
  Revision  Changes    Path
  1.5       +2 -1      jboss-seam/src/test/misc/org/jboss/seam/test/Foo.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Foo.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/Foo.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Foo.java	21 Dec 2005 10:46:46 -0000	1.4
  +++ Foo.java	25 Oct 2006 15:37:36 -0000	1.5
  @@ -18,10 +18,11 @@
   
   /**
    * @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   @Name("foo")
   @Scope(ScopeType.SESSION)
  + at SuppressWarnings("deprecation")
   public class Foo
   {
      
  
  
  
  1.2       +9 -11     jboss-seam/src/test/misc/org/jboss/seam/test/MethodExpressionParserTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MethodExpressionParserTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/MethodExpressionParserTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- MethodExpressionParserTest.java	9 Aug 2006 20:30:08 -0000	1.1
  +++ MethodExpressionParserTest.java	25 Oct 2006 15:37:36 -0000	1.2
  @@ -37,19 +37,17 @@
      @Test 
      public void testStaticMEParserMethods()
      {
  -       MethodExpressionParser parser = new MethodExpressionParser("");
  -       
          // is a param a quoted String or a value expression?
  -       assert parser.isQuotedString("'foo'");
  -       assert !parser.isQuotedString("foo");
  -       assert parser.isQuotedString("\"foo\"");
  +       assert MethodExpressionParser.isQuotedString("'foo'");
  +       assert !MethodExpressionParser.isQuotedString("foo");
  +       assert MethodExpressionParser.isQuotedString("\"foo\"");
          
          // is the entire expression just a String literal?
  -       assert parser.isStringLiteral("foo");
  -       assert parser.isStringLiteral("#{foo");
  -       assert parser.isStringLiteral("\\#{foo}");
  -       assert !parser.isStringLiteral("${foo}");
  -       assert !parser.isStringLiteral("#{foo}");
  +       assert MethodExpressionParser.isStringLiteral("foo");
  +       assert MethodExpressionParser.isStringLiteral("#{foo");
  +       assert MethodExpressionParser.isStringLiteral("\\#{foo}");
  +       assert !MethodExpressionParser.isStringLiteral("${foo}");
  +       assert !MethodExpressionParser.isStringLiteral("#{foo}");
      }
       
      @Test
  
  
  
  1.3       +3 -0      jboss-seam/src/test/misc/org/jboss/seam/test/PageflowTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PageflowTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/PageflowTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PageflowTest.java	30 Jun 2006 10:58:26 -0000	1.2
  +++ PageflowTest.java	25 Oct 2006 15:37:36 -0000	1.3
  @@ -94,6 +94,9 @@
       Page confirm = (Page) pageflowDefinition.getNode("confirm");
       Page complete = (Page) pageflowDefinition.getNode("complete");
       Page cont = (Page) pageflowDefinition.getNode("continue");
  +    assert confirm!=null;
  +    assert complete!=null;
  +    assert cont!=null;
       
       ProcessInstance pageflowInstance = new ProcessInstance(pageflowDefinition);
       Token token = pageflowInstance.getRootToken();
  
  
  
  1.22      +2 -2      jboss-seam/src/test/misc/org/jboss/seam/test/PhaseListenerTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PhaseListenerTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/PhaseListenerTest.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- PhaseListenerTest.java	18 Oct 2006 18:06:52 -0000	1.21
  +++ PhaseListenerTest.java	25 Oct 2006 15:37:36 -0000	1.22
  @@ -1,4 +1,4 @@
  -//$Id: PhaseListenerTest.java,v 1.21 2006/10/18 18:06:52 gavin Exp $
  +//$Id: PhaseListenerTest.java,v 1.22 2006/10/25 15:37:36 gavin Exp $
   package org.jboss.seam.test;
   
   import java.util.ArrayList;
  @@ -208,7 +208,7 @@
   
      private Map getPageMap(MockFacesContext facesContext)
      {
  -      return (Map) facesContext.getViewRoot().getAttributes();
  +      return facesContext.getViewRoot().getAttributes();
      }
   
      @Test
  
  
  
  1.7       +3 -3      jboss-seam/src/test/misc/org/jboss/seam/test/RemotingTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RemotingTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/test/misc/org/jboss/seam/test/RemotingTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- RemotingTest.java	13 Oct 2006 10:14:28 -0000	1.6
  +++ RemotingTest.java	25 Oct 2006 15:37:36 -0000	1.7
  @@ -71,7 +71,7 @@
       return e;
     }
   
  -  private enum TestEnum {red, green, blue};
  +  private enum TestEnum {red, green, blue}
   
     @Test
     public void testBooleanWrapper()
  @@ -389,7 +389,7 @@
         wrapper.convert(InvalidList.class);
         assert false;
       }
  -    catch (ConversionException ex) {};
  +    catch (ConversionException ex) {}
   
       t = RemotingTest.class.getMethod("dummyInvalid").getGenericReturnType();
       try {
  @@ -397,7 +397,7 @@
         wrapper.convert(t);
         assert false;
       }
  -    catch (ConversionException ex) { };
  +    catch (ConversionException ex) { }
   
       int[] intValues = new int[2];
       intValues[0] = 44444;