endefr-cvs — CVS commit messages. DO NOT POST!

[Endefr-cvs] endefr/tests/java/endefr/tests/script AllocationExpressionTest.java,1.1.2.1,1.1.2.2

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/java/endefr/tests/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22386/tests/java/endefr/tests/script

Modified Files:
      Tag: Br1_01
	AllocationExpressionTest.java 
Log Message:
Made production of allocation expression more robust.

Added allocation expression tests.

Index: AllocationExpressionTest.java
===================================================================
RCS file: /cvsroot/endefr/endefr/tests/java/endefr/tests/script/Attic/AllocationExpressionTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** AllocationExpressionTest.java	16 Dec 2005 18:33:11 -0000	1.1.2.1
--- AllocationExpressionTest.java	16 Dec 2005 19:55:59 -0000	1.1.2.2
***************
*** 20,23 ****
--- 20,24 ----
  import org.endefr.script.EndefrScriptParser;
  import org.endefr.script.ParseException;
+ import org.testng.annotations.ExpectedExceptions;
  import org.testng.annotations.Test;
  
***************
*** 73,76 ****
--- 74,150 ----
    /**
     * <p>
+    * Test that the allocation of a generic class is valid.
+    * </p>
+    * 
+    * @throws FileNotFoundException
+    *           when the test file cannot be found.
+    * @throws ParseException
+    *           when the compound script used for the test contains a syntax
+    *           error.
+    */
+   @Test()
+   public void testAllocationOfGenericClassIsValid()
+       throws FileNotFoundException,
+         ParseException
+     {
+     EndefrScriptParser lParser;
+ 
+     lParser = createParser("AllocationOfGenericClass");
+     lParser.allocationExpression();
+     lParser.endOfFile();
+     }
+ 
+ 
+   /**
+    * <p>
+    * Test that the allocation of a class using a generic constructor is valid.
+    * </p>
+    * 
+    * @throws FileNotFoundException
+    *           when the test file cannot be found.
+    * @throws ParseException
+    *           when the compound script used for the test contains a syntax
+    *           error.
+    */
+   @Test()
+   public void testAllocationOfClassUsingGenericConstructorIsValid()
+       throws FileNotFoundException,
+         ParseException
+     {
+     EndefrScriptParser lParser;
+ 
+     lParser = createParser("AllocationOfClassUsingGenericConstructor");
+     lParser.allocationExpression();
+     lParser.endOfFile();
+     }
+ 
+ 
+   /**
+    * <p>
+    * Test that the allocation of a generic class using a generic constructor is
+    * valid.
+    * </p>
+    * 
+    * @throws FileNotFoundException
+    *           when the test file cannot be found.
+    * @throws ParseException
+    *           when the compound script used for the test contains a syntax
+    *           error.
+    */
+   @Test()
+   public void testAllocationOfGenericClassUsingGenericConstructorIsValid()
+       throws FileNotFoundException,
+         ParseException
+     {
+     EndefrScriptParser lParser;
+ 
+     lParser = createParser("AllocationOfGenericClassUsingGenericConstructor");
+     lParser.allocationExpression();
+     lParser.endOfFile();
+     }
+ 
+ 
+   /**
+    * <p>
     * Test that the allocation of a class with constructor arguments is valid.
     * </p>
***************
*** 121,124 ****
--- 195,222 ----
    /**
     * <p>
+    * Test that the allocation of a generic class array is valid.
+    * </p>
+    * 
+    * @throws FileNotFoundException
+    *           when the test file cannot be found.
+    * @throws ParseException
+    *           when the compound script used for the test contains a syntax
+    *           error.
+    */
+   @Test()
+   public void testAllocationOfGenericClassArrayIsValid()
+       throws FileNotFoundException,
+         ParseException
+     {
+     EndefrScriptParser lParser;
+ 
+     lParser = createParser("AllocationOfGenericClassArray");
+     lParser.allocationExpression();
+     lParser.endOfFile();
+     }
+ 
+ 
+   /**
+    * <p>
     * Test that the allocation of an initialized class array is valid.
     * </p>
***************
*** 169,172 ****
--- 267,299 ----
    /**
     * <p>
+    * Test that the allocation of a class array using a generic constructor is
+    * invalid.
+    * </p>
+    * 
+    * @throws FileNotFoundException
+    *           when the test file cannot be found.
+    * @throws ParseException
+    *           when the compound script used for the test contains a syntax
+    *           error.
+    */
+   @Test()
+   @ExpectedExceptions(value =
+     {
+       ParseException.class
+     })
+   public void testAllocationOfClassArrayUsingGenericConstructorIsInvalid()
+       throws FileNotFoundException,
+         ParseException
+     {
+     EndefrScriptParser lParser;
+ 
+     lParser = createParser("AllocationOfClassArrayUsingGenericConstructor");
+     lParser.allocationExpression();
+     lParser.endOfFile();
+     }
+ 
+ 
+   /**
+    * <p>
     * Test that the allocation of a primitive array is valid.
     * </p>

[Endefr-cvs] endefr/source/javacc EndefrScriptParser.jj,1.1.2.4,1.1.2.5

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/source/javacc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22386/source/javacc

Modified Files:
      Tag: Br1_01
	EndefrScriptParser.jj 
Log Message:
Made production of allocation expression more robust.

Added allocation expression tests.

Index: EndefrScriptParser.jj
===================================================================
RCS file: /cvsroot/endefr/endefr/source/javacc/Attic/EndefrScriptParser.jj,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** EndefrScriptParser.jj	16 Dec 2005 18:41:31 -0000	1.1.2.4
--- EndefrScriptParser.jj	16 Dec 2005 19:56:00 -0000	1.1.2.5
***************
*** 850,865 ****
    }
    {
!   LOOKAHEAD(2)
!   "new" primitiveType() arrayDimsAndInits()
!   |
!   "new" 
!     [ 
!     typeArguments() 
!     ]
!   classOrInterfaceType()
      (
!     arrayDimsAndInits()
      |
!     arguments()
      )
    }
--- 850,864 ----
    }
    {
!   "new"
      (
!     primitiveType() arrayDimsAndInits()
      |
!     LOOKAHEAD(classOrInterfaceType() "[")
!     classOrInterfaceType() arrayDimsAndInits()
!     |
!       [
!       typeArguments() 
!       ]
!     classOrInterfaceType() arguments()
      )
    }

[Endefr-cvs] endefr/tests/files/script.AllocationExpressionTest AllocationOfGenericClassArray.ess,NONE,1.1.2.1 AllocationOfGenericClassUsingGenericConstructor.ess,NONE,1.1.2.1 AllocationOfGenericClass.ess,NONE,1.1.2.1 AllocationOfClassUsingGenericConstructor.ess,NONE,1.1.2.1 AllocationOfClassArrayUsingGenericConstructor.ess,NONE,1.1.2.1

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.AllocationExpressionTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22386/tests/files/script.AllocationExpressionTest

Added Files:
      Tag: Br1_01
	AllocationOfGenericClassArray.ess 
	AllocationOfGenericClassUsingGenericConstructor.ess 
	AllocationOfGenericClass.ess 
	AllocationOfClassUsingGenericConstructor.ess 
	AllocationOfClassArrayUsingGenericConstructor.ess 
Log Message:
Made production of allocation expression more robust.

Added allocation expression tests.

--- NEW FILE: AllocationOfClassUsingGenericConstructor.ess ---
new <String> Foo()
--- NEW FILE: AllocationOfGenericClassArray.ess ---
new List<String>[null]
--- NEW FILE: AllocationOfClassArrayUsingGenericConstructor.ess ---
new <String> Foo[null]
--- NEW FILE: AllocationOfGenericClass.ess ---
new Map<String, Button>()
--- NEW FILE: AllocationOfGenericClassUsingGenericConstructor.ess ---
new <String> List<Button>()

[Endefr-cvs] endefr/source/implementation/org/endefr/script Token.java,1.1.2.1,1.1.2.2

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/source/implementation/org/endefr/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6219/source/implementation/org/endefr/script

Modified Files:
      Tag: Br1_01
	Token.java 
Log Message:
'@Override()' annotation fixes.

Index: Token.java
===================================================================
RCS file: /cvsroot/endefr/endefr/source/implementation/org/endefr/script/Attic/Token.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Token.java	14 Dec 2005 20:02:15 -0000	1.1.2.1
--- Token.java	16 Dec 2005 18:43:48 -0000	1.1.2.2
***************
*** 98,102 ****
     * @return the value of <code>image</code>.
     */
!   @Override
    public String toString()
      {
--- 98,102 ----
     * @return the value of <code>image</code>.
     */
!   @Override()
    public String toString()
      {

[Endefr-cvs] endefr/source/public/org/endefr/application TestEndefrApplication.java,1.1.2.2,1.1.2.3

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/source/public/org/endefr/application
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6219/source/public/org/endefr/application

Modified Files:
      Tag: Br1_01
	TestEndefrApplication.java 
Log Message:
'@Override()' annotation fixes.

Index: TestEndefrApplication.java
===================================================================
RCS file: /cvsroot/endefr/endefr/source/public/org/endefr/application/Attic/TestEndefrApplication.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** TestEndefrApplication.java	14 Dec 2005 20:02:12 -0000	1.1.2.2
--- TestEndefrApplication.java	16 Dec 2005 18:43:48 -0000	1.1.2.3
***************
*** 34,37 ****
--- 34,38 ----
      }
    
+   @Override()
    protected void dummy()
      {

[Endefr-cvs] endefr/source/public/org/endefr EndefrConfigurationBean.java,1.1.2.2,1.1.2.3

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/source/public/org/endefr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6219/source/public/org/endefr

Modified Files:
      Tag: Br1_01
	EndefrConfigurationBean.java 
Log Message:
'@Override()' annotation fixes.

Index: EndefrConfigurationBean.java
===================================================================
RCS file: /cvsroot/endefr/endefr/source/public/org/endefr/Attic/EndefrConfigurationBean.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** EndefrConfigurationBean.java	14 Dec 2005 20:02:14 -0000	1.1.2.2
--- EndefrConfigurationBean.java	16 Dec 2005 18:43:49 -0000	1.1.2.3
***************
*** 28,31 ****
--- 28,32 ----
      }
    
+   @Override()
    protected void dummy()
      {

[Endefr-cvs] endefr/source/javacc EndefrScriptParser.jj,1.1.2.3,1.1.2.4

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/source/javacc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5733/source/javacc

Modified Files:
      Tag: Br1_01
	EndefrScriptParser.jj 
Log Message:
Changed 'allocationExpression(...)' to allow use of generic constructors.

Index: EndefrScriptParser.jj
===================================================================
RCS file: /cvsroot/endefr/endefr/source/javacc/Attic/EndefrScriptParser.jj,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** EndefrScriptParser.jj	16 Dec 2005 18:31:06 -0000	1.1.2.3
--- EndefrScriptParser.jj	16 Dec 2005 18:41:31 -0000	1.1.2.4
***************
*** 853,857 ****
    "new" primitiveType() arrayDimsAndInits()
    |
!   "new" classOrInterfaceType()
      (
      arrayDimsAndInits()
--- 853,861 ----
    "new" primitiveType() arrayDimsAndInits()
    |
!   "new" 
!     [ 
!     typeArguments() 
!     ]
!   classOrInterfaceType()
      (
      arrayDimsAndInits()

[Endefr-cvs] endefr/tests/java/endefr/tests/script MethodInvocationTest.java,NONE,1.1.2.1 AllocationExpressionTest.java,NONE,1.1.2.1 ExpressionInParenthesesTest.java,NONE,1.1.2.1 LiteralExpressionTest.java,NONE,1.1.2.1 ScriptParserTest.java,1.1.2.1,1.1.2.2 CommentTest.java,1.1.2.1,1.1.2.2 ClassExpressionTest.java,1.1.2.1,1.1.2.2 ImportDeclarationTest.java,1.1.2.1,1.1.2.2 ScriptIdentifierTest.java,1.1.2.1,1.1.2.2

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/java/endefr/tests/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests/java/endefr/tests/script

Modified Files:
      Tag: Br1_01
	ScriptParserTest.java CommentTest.java 
	ClassExpressionTest.java ImportDeclarationTest.java 
	ScriptIdentifierTest.java 
Added Files:
      Tag: Br1_01
	MethodInvocationTest.java AllocationExpressionTest.java 
	ExpressionInParenthesesTest.java LiteralExpressionTest.java 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

Index: ScriptParserTest.java
===================================================================
RCS file: /cvsroot/endefr/endefr/tests/java/endefr/tests/script/Attic/ScriptParserTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ScriptParserTest.java	14 Dec 2005 20:02:11 -0000	1.1.2.1
--- ScriptParserTest.java	16 Dec 2005 18:33:11 -0000	1.1.2.2
***************
*** 8,12 ****
  import org.endefr.script.EndefrScriptParser;
  import org.endefr.script.ParseException;
- import org.endefr.script.ast.CompoundScript;
  
  
--- 8,11 ----
***************
*** 29,33 ****
      {
      super();
!     
      // No action needed.
      }
--- 28,32 ----
      {
      super();
! 
      // No action needed.
      }
***************
*** 36,47 ****
    /**
     * <p>
!    * Create a parser and parse the file named <code>pTestFilename</code>.
     * </p>
     * 
     * @param pTestFilename
!    *          the filename of the file containing the compound script, without
!    *          extension.
!    * @return the compound script represented by the code in
!    *         <code>pTestFilename</code>.
     * @throws FileNotFoundException
     *           when <code>pTestFilename</code> cannot be found.
--- 35,45 ----
    /**
     * <p>
!    * Create a parser which will parse the file named <code>pTestFilename</code>.
     * </p>
     * 
     * @param pTestFilename
!    *          the filename of the file containing the (partial) script, without
!    *          extension <code>ess</code> (Endefr script snippet).
!    * @return the parser which will parse <code>pTestFilename</code>.
     * @throws FileNotFoundException
     *           when <code>pTestFilename</code> cannot be found.
***************
*** 50,66 ****
     *           a syntax error.
     */
!   protected CompoundScript runTest(String pTestFilename)
        throws FileNotFoundException,
          ParseException
      {
!     CompoundScript result;
      File lScriptFile;
      EndefrScriptParser lParser;
  
!     lScriptFile = createTestFile(this, pTestFilename + ".ecs");
      lParser = new EndefrScriptParser(new FileReader(lScriptFile));
!     result = lParser.compoundScript();
  
      return result;
      }
    }
--- 48,72 ----
     *           a syntax error.
     */
!   protected EndefrScriptParser createParser(String pTestFilename)
        throws FileNotFoundException,
          ParseException
      {
!     EndefrScriptParser result;
      File lScriptFile;
      EndefrScriptParser lParser;
  
!     lScriptFile = createTestFile(this, pTestFilename + TEST_FILES_EXTENSION);
      lParser = new EndefrScriptParser(new FileReader(lScriptFile));
!     result = lParser;
  
      return result;
      }
+ 
+ 
+   /**
+    * <p>
+    * The extension of test files. It stands for <i>Endefr script snipper</i>.
+    * </p>
+    */
+   private static final String TEST_FILES_EXTENSION = ".ess";
    }

Index: ClassExpressionTest.java
===================================================================
RCS file: /cvsroot/endefr/endefr/tests/java/endefr/tests/script/Attic/ClassExpressionTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ClassExpressionTest.java	14 Dec 2005 20:02:11 -0000	1.1.2.1
--- ClassExpressionTest.java	16 Dec 2005 18:33:11 -0000	1.1.2.2
***************
*** 3,6 ****
--- 3,7 ----
  
  import java.io.FileNotFoundException;
+ import org.endefr.script.EndefrScriptParser;
  import org.endefr.script.ParseException;
  import org.testng.annotations.ExpectedExceptions;
***************
*** 27,31 ****
      {
      super();
!     
      // No action needed.
      }
--- 28,32 ----
      {
      super();
! 
      // No action needed.
      }
***************
*** 40,45 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 41,46 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 48,52 ****
          ParseException
      {
!     runTest("VoidClass");
      }
  
--- 49,57 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("VoidClass");
!     lParser.primaryExpression();
!     lParser.endOfFile();
      }
  
***************
*** 60,65 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 65,70 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 68,72 ****
          ParseException
      {
!     runTest("PrimitiveClass");
      }
  
--- 73,81 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("PrimitiveClass");
!     lParser.primaryExpression();
!     lParser.endOfFile();
      }
  
***************
*** 80,92 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
!   public void testInterfaceOrClassClassIsValid()
        throws FileNotFoundException,
          ParseException
      {
!     runTest("ClassOrInterfaceClass");
      }
  
--- 89,105 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
!   public void testClassOrInterfaceClassIsValid()
        throws FileNotFoundException,
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("ClassOrInterfaceClass");
!     lParser.primaryExpression();
!     lParser.endOfFile();
      }
  
***************
*** 101,106 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 114,119 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 109,117 ****
        ParseException.class
      })
!   public void testGenericInterfaceOrClassClassIsInvalid()
        throws FileNotFoundException,
          ParseException
      {
!     runTest("GenericClassOrInterfaceClass");
      }
  
--- 122,134 ----
        ParseException.class
      })
!   public void testGenericClassOrInterfaceClassIsInvalid()
        throws FileNotFoundException,
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("GenericClassOrInterfaceClass");
!     lParser.primaryExpression();
!     lParser.endOfFile();
      }
  
***************
*** 126,131 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 143,148 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 138,142 ****
          ParseException
      {
!     runTest("VoidArrayClass");
      }
  
--- 155,163 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("VoidArrayClass");
!     lParser.primaryExpression();
!     lParser.endOfFile();
      }
  
***************
*** 150,155 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 171,176 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 158,162 ****
          ParseException
      {
!     runTest("PrimitiveArrayClass");
      }
  
--- 179,187 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("PrimitiveArrayClass");
!     lParser.primaryExpression();
!     lParser.endOfFile();
      }
  
***************
*** 171,176 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 196,201 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 179,183 ****
          ParseException
      {
!     runTest("ClassOrInterfaceArrayClass");
      }
  
--- 204,212 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("ClassOrInterfaceArrayClass");
!     lParser.primaryExpression();
!     lParser.endOfFile();
      }
  
***************
*** 192,197 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 221,226 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 200,208 ****
        ParseException.class
      })
!   public void testGenericInterfaceOrClassArrayClassIsInvalid()
        throws FileNotFoundException,
          ParseException
      {
!     runTest("GenericClassOrInterfaceArrayClass");
      }
    }
--- 229,241 ----
        ParseException.class
      })
!   public void testGenericClassOrInterfaceArrayClassIsInvalid()
        throws FileNotFoundException,
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("GenericClassOrInterfaceArrayClass");
!     lParser.primaryExpression();
!     lParser.endOfFile();
      }
    }

--- NEW FILE: AllocationExpressionTest.java ---
/*
 * Copyright 2005 Johan Stuyts
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package endefr.tests.script;


import java.io.FileNotFoundException;
import org.endefr.script.EndefrScriptParser;
import org.endefr.script.ParseException;
import org.testng.annotations.Test;


/**
 * <p>
 * Tests for allocation expressions.
 * </p>
 * 
 * @author Johan Stuyts
 */
public class AllocationExpressionTest
    extends
      ScriptParserTest
  {
  /**
   * <p>
   * Construct an instance of this class.
   * </p>
   */
  public AllocationExpressionTest()
    {
    super();

    // No action needed.
    }


  /**
   * <p>
   * Test that the allocation of a class is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testAllocationOfClassIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("AllocationOfClass");
    lParser.allocationExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that the allocation of a class with constructor arguments is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testAllocationOfClassWithArgumentsIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("AllocationOfClassWithArguments");
    lParser.allocationExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that the allocation of a class array is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testAllocationOfClassArrayIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("AllocationOfClassArray");
    lParser.allocationExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that the allocation of an initialized class array is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testAllocationOfInitializedClassArrayIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("AllocationOfInitializedClassArray");
    lParser.allocationExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that the allocation of a array of class arrays is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testAllocationOfClassArrayArrayIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("AllocationOfClassArrayArray");
    lParser.allocationExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that the allocation of a primitive array is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testAllocationOfPrimitiveArrayIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("AllocationOfPrimitiveArray");
    lParser.allocationExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that the allocation of an initialized primitive array is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testAllocationOfInitializedPrimitiveArrayIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("AllocationOfInitializedPrimitiveArray");
    lParser.allocationExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that the allocation of a array of primitive arrays is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testAllocationOfPrimitiveArrayArrayIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("AllocationOfPrimitiveArrayArray");
    lParser.allocationExpression();
    lParser.endOfFile();
    }
  }

--- NEW FILE: MethodInvocationTest.java ---
package endefr.tests.script;


import java.io.FileNotFoundException;
import org.endefr.script.EndefrScriptParser;
import org.endefr.script.ParseException;
import org.testng.annotations.Test;


/**
 * <p>
 * Test for method invocations.
 * </p>
 * 
 * @author Johan Stuyts
 */
public class MethodInvocationTest
    extends
      ScriptParserTest
  {
  /**
   * <p>
   * Construct an instance of this class.
   * </p>
   */
  public MethodInvocationTest()
    {
    super();

    // No action needed.
    }


  /**
   * <p>
   * Test that a method invocation without arguments is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testMethodInvocationWithoutArgumentsIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;
    
    lParser = createParser("MethodInvocationWithoutArguments");
    lParser.primaryExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that a method invocation with one arguments is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testMethodInvocationWithOneArgumentIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;
    
    lParser = createParser("MethodInvocationWithOneArgument");
    lParser.primaryExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that a method invocation with multiple arguments is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testMethodInvocationWithMultipleArgumentsIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;
    
    lParser = createParser("MethodInvocationWithMultipleArguments");
    lParser.primaryExpression();
    lParser.endOfFile();
    }
  }

--- NEW FILE: ExpressionInParenthesesTest.java ---
package endefr.tests.script;


import java.io.FileNotFoundException;
import org.endefr.script.EndefrScriptParser;
import org.endefr.script.ParseException;
import org.testng.annotations.Test;


/**
 * <p>
 * Tests for expressions in parentheses.
 * </p>
 * 
 * @author Johan Stuyts
 */
public class ExpressionInParenthesesTest
    extends
      ScriptParserTest
  {
  /**
   * <p>
   * Construct an instance of this class.
   * </p>
   */
  public ExpressionInParenthesesTest()
    {
    super();

    // No action needed.
    }


  /**
   * <p>
   * Test that an expression in parentheses is valid.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testExpressionInParenthesesIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;
    
    lParser = createParser("ExpressionInParentheses");
    lParser.primaryExpression();
    lParser.endOfFile();
    }
  }

Index: ScriptIdentifierTest.java
===================================================================
RCS file: /cvsroot/endefr/endefr/tests/java/endefr/tests/script/Attic/ScriptIdentifierTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ScriptIdentifierTest.java	14 Dec 2005 20:02:11 -0000	1.1.2.1
--- ScriptIdentifierTest.java	16 Dec 2005 18:33:11 -0000	1.1.2.2
***************
*** 3,6 ****
--- 3,7 ----
  
  import java.io.FileNotFoundException;
+ import org.endefr.script.EndefrScriptParser;
  import org.endefr.script.ParseException;
  import org.testng.annotations.ExpectedExceptions;
***************
*** 27,31 ****
      {
      super();
!     
      // No action needed.
      }
--- 28,32 ----
      {
      super();
! 
      // No action needed.
      }
***************
*** 41,46 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 42,47 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 53,57 ****
          ParseException
      {
!     runTest("ScriptWithoutIdentifiers");
      }
  
--- 54,61 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("ScriptWithoutIdentifiers");
!     lParser.compoundScript();
      }
  
***************
*** 65,70 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 69,74 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 73,77 ****
          ParseException
      {
!     runTest("ScriptWithSingleIdentifier");
      }
  
--- 77,84 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("ScriptWithSingleIdentifier");
!     lParser.compoundScript();
      }
  
***************
*** 85,90 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 92,97 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 93,97 ****
          ParseException
      {
!     runTest("ScriptWithMultipleIdentifiers");
      }
  
--- 100,107 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("ScriptWithMultipleIdentifiers");
!     lParser.compoundScript();
      }
  
***************
*** 106,111 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 116,121 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 114,118 ****
          ParseException
      {
!     runTest("NoWhitespaceBeforeIdentifier");
      }
  
--- 124,131 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("NoWhitespaceBeforeIdentifier");
!     lParser.compoundScript();
      }
  
***************
*** 127,132 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 140,145 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 135,139 ****
          ParseException
      {
!     runTest("WhitespaceBeforeIdentifier");
      }
  
--- 148,155 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("WhitespaceBeforeIdentifier");
!     lParser.compoundScript();
      }
  
***************
*** 148,153 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 164,169 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 156,160 ****
          ParseException
      {
!     runTest("ArbitrayNumberOfPoundSigns");
      }
  
--- 172,179 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("ArbitrayNumberOfPoundSigns");
!     lParser.compoundScript();
      }
  
***************
*** 169,174 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 188,193 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 181,185 ****
          ParseException
      {
!     runTest("ScriptWithDuplicateIdentifiers");
      }
    }
--- 200,207 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("ScriptWithDuplicateIdentifiers");
!     lParser.compoundScript();
      }
    }

Index: ImportDeclarationTest.java
===================================================================
RCS file: /cvsroot/endefr/endefr/tests/java/endefr/tests/script/Attic/ImportDeclarationTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ImportDeclarationTest.java	14 Dec 2005 20:02:11 -0000	1.1.2.1
--- ImportDeclarationTest.java	16 Dec 2005 18:33:11 -0000	1.1.2.2
***************
*** 3,6 ****
--- 3,7 ----
  
  import java.io.FileNotFoundException;
+ import org.endefr.script.EndefrScriptParser;
  import org.endefr.script.ParseException;
  import org.endefr.script.ast.CompoundScript;
***************
*** 28,32 ****
      {
      super();
!     
      // No action needed.
      }
--- 29,33 ----
      {
      super();
! 
      // No action needed.
      }
***************
*** 41,46 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 42,47 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 49,53 ****
          ParseException
      {
!     runTest("NoImportDeclaration");
      }
  
--- 50,57 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("NoImportDeclaration");
!     lParser.compoundScript();
      }
  
***************
*** 61,66 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 65,70 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 69,73 ****
          ParseException
      {
!     runTest("OneImportDeclaration");
      }
  
--- 73,80 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("OneImportDeclaration");
!     lParser.compoundScript();
      }
  
***************
*** 81,86 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test(dependsOnMethods =
--- 88,93 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test(dependsOnMethods =
***************
*** 92,96 ****
          ParseException
      {
!     runTest("MultipleImportDeclarations");
      }
  
--- 99,106 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("MultipleImportDeclarations");
!     lParser.compoundScript();
      }
  
***************
*** 104,109 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 114,119 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 116,120 ****
          ParseException
      {
!     runTest("WildcardImportDeclaration");
      }
  
--- 126,133 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("WildcardImportDeclaration");
!     lParser.compoundScript();
      }
  
***************
*** 129,134 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test(dependsOnMethods =
--- 142,147 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test(dependsOnMethods =
***************
*** 140,146 ****
          ParseException
      {
      CompoundScript lCompoundScript;
  
!     lCompoundScript = runTest("ImportDeclarationIsAddedToCompoundScript");
      assert lCompoundScript.containsImportDeclaration("java.util.Random") : "Import declaration not added to compound script";
      }
--- 153,161 ----
          ParseException
      {
+     EndefrScriptParser lParser;
      CompoundScript lCompoundScript;
  
!     lParser = createParser("ImportDeclarationIsAddedToCompoundScript");
!     lCompoundScript = lParser.compoundScript();
      assert lCompoundScript.containsImportDeclaration("java.util.Random") : "Import declaration not added to compound script";
      }

Index: CommentTest.java
===================================================================
RCS file: /cvsroot/endefr/endefr/tests/java/endefr/tests/script/Attic/CommentTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** CommentTest.java	14 Dec 2005 20:02:11 -0000	1.1.2.1
--- CommentTest.java	16 Dec 2005 18:33:11 -0000	1.1.2.2
***************
*** 3,6 ****
--- 3,7 ----
  
  import java.io.FileNotFoundException;
+ import org.endefr.script.EndefrScriptParser;
  import org.endefr.script.ParseException;
  import org.testng.annotations.Test;
***************
*** 26,33 ****
      {
      super();
!     
      // No action needed.
      }
! 
    /**
     * <p>
--- 27,34 ----
      {
      super();
! 
      // No action needed.
      }
!   
    /**
     * <p>
***************
*** 38,43 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 39,44 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 46,50 ****
          ParseException
      {
!     runTest("EndOfLineCommentAtStartOfLine");
      }
  
--- 47,54 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("EndOfLineCommentAtStartOfLine");
!     lParser.compoundScript();
      }
  
***************
*** 58,63 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 62,67 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 66,70 ****
          ParseException
      {
!     runTest("EndOfLineCommentAfterStatement");
      }
  
--- 70,77 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("EndOfLineCommentAfterStatement");
!     lParser.compoundScript();
      }
  
***************
*** 78,83 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 85,90 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 86,90 ****
          ParseException
      {
!     runTest("EndOfLineCommentSplitsStatement");
      }
  
--- 93,100 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("EndOfLineCommentSplitsStatement");
!     lParser.compoundScript();
      }
  
***************
*** 98,103 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 108,113 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 106,110 ****
          ParseException
      {
!     runTest("MultilineCommentAtStartOfLine");
      }
  
--- 116,123 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("MultilineCommentAtStartOfLine");
!     lParser.compoundScript();
      }
  
***************
*** 118,123 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 131,136 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 126,130 ****
          ParseException
      {
!     runTest("MultilineCommentAfterStatement");
      }
  
--- 139,146 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("MultilineCommentAfterStatement");
!     lParser.compoundScript();
      }
  
***************
*** 138,143 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 154,159 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 146,150 ****
          ParseException
      {
!     runTest("MultilineCommentSplitsStatement");
      }
  
--- 162,169 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("MultilineCommentSplitsStatement");
!     lParser.compoundScript();
      }
  
***************
*** 158,163 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 177,182 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 166,170 ****
          ParseException
      {
!     runTest("StatementAfterMultilineCommentAllowed");
      }
  
--- 185,192 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("StatementAfterMultilineCommentAllowed");
!     lParser.compoundScript();
      }
  
***************
*** 178,183 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 200,205 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 186,190 ****
          ParseException
      {
!     runTest("EmptyMultilineComment");
      }
  
--- 208,215 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("EmptyMultilineComment");
!     lParser.compoundScript();
      }
  
***************
*** 198,203 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 223,228 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 206,210 ****
          ParseException
      {
!     runTest("EmptyJavadocComment");
      }
  
--- 231,238 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("EmptyJavadocComment");
!     lParser.compoundScript();
      }
  
***************
*** 218,223 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 246,251 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 226,230 ****
          ParseException
      {
!     runTest("NonEmptyJavadocComment");
      }
  
--- 254,261 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("NonEmptyJavadocComment");
!     lParser.compoundScript();
      }
  
***************
*** 239,244 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 270,275 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 247,251 ****
          ParseException
      {
!     runTest("ArbitraryNumberOfAsterisksAtStart");
      }
  
--- 278,285 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("ArbitraryNumberOfAsterisksAtStart");
!     lParser.compoundScript();
      }
  
***************
*** 260,265 ****
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script in <code>pTestFilename</code> contains
!    *           a syntax error.
     */
    @Test()
--- 294,299 ----
     *           when the test file cannot be found.
     * @throws ParseException
!    *           when the compound script used for the test contains a syntax
!    *           error.
     */
    @Test()
***************
*** 268,272 ****
          ParseException
      {
!     runTest("ArbitraryNumberOfAsterisksAtEnd");
      }
    }
--- 302,309 ----
          ParseException
      {
!     EndefrScriptParser lParser;
! 
!     lParser = createParser("ArbitraryNumberOfAsterisksAtEnd");
!     lParser.compoundScript();
      }
    }

--- NEW FILE: LiteralExpressionTest.java ---
package endefr.tests.script;


import java.io.FileNotFoundException;
import org.endefr.script.EndefrScriptParser;
import org.endefr.script.ParseException;
import org.testng.annotations.Test;


/**
 * <p>
 * Tests for literal expressions.
 * </p>
 * 
 * @author Johan Stuyts
 */
public class LiteralExpressionTest
    extends
      ScriptParserTest
  {
  /**
   * <p>
   * Construct an instance of this class
   * </p>
   */
  public LiteralExpressionTest()
    {
    super();

    // No action needed.
    }


  /**
   * <p>
   * Test that a <code>String</code> literal is a valid expression.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testStringLiteralIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("StringLiteral");
    lParser.primaryExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that a positive integer literal is a valid expression.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testPositiveIntegerLiteralIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("PositiveIntegerLiteral");
    lParser.primaryExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that a 64-bit positive integer literal is a valid expression.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void test64BitPositiveIntegerLiteralIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("64BitPositiveIntegerLiteral");
    lParser.primaryExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that a positive floating point literal is a valid expression.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testPositiveFloatingPointLiteralIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("PositiveFloatingPointLiteral");
    lParser.primaryExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that a 64-bit positive floating point literal is a valid expression.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void test64BitPositiveFloatingPointLiteralIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("64BitPositiveFloatingPointLiteral");
    lParser.primaryExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that a character literal is a valid expression.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testCharacterLiteralIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("CharacterLiteral");
    lParser.primaryExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that a boolean literal is a valid expression.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testBooleanLiteralIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("BooleanLiteral");
    lParser.primaryExpression();
    lParser.endOfFile();
    }


  /**
   * <p>
   * Test that a <code>null</code> literal is a valid expression.
   * </p>
   * 
   * @throws FileNotFoundException
   *           when the test file cannot be found.
   * @throws ParseException
   *           when the compound script used for the test contains a syntax
   *           error.
   */
  @Test()
  public void testNullLiteralIsValid()
      throws FileNotFoundException,
        ParseException
    {
    EndefrScriptParser lParser;

    lParser = createParser("NullLiteral");
    lParser.primaryExpression();
    lParser.endOfFile();
    }
  }

[Endefr-cvs] endefr/tests/files/script.AllocationExpressionTest AllocationOfPrimitiveArrayArray.ess,NONE,1.1.2.1 AllocationOfClassWithArguments.ess,NONE,1.1.2.1 AllocationOfInitializedPrimitiveArray.ess,NONE,1.1.2.1 AllocationOfPrimitiveArray.ess,NONE,1.1.2.1 AllocationOfInitializedClassArray.ess,NONE,1.1.2.1 AllocationOfClassArray.ess,NONE,1.1.2.1 AllocationOfClass.ess,NONE,1.1.2.1 AllocationOfClassArrayArray.ess,NONE,1.1.2.1

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.AllocationExpressionTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests/files/script.AllocationExpressionTest

Added Files:
      Tag: Br1_01
	AllocationOfPrimitiveArrayArray.ess 
	AllocationOfClassWithArguments.ess 
	AllocationOfInitializedPrimitiveArray.ess 
	AllocationOfPrimitiveArray.ess 
	AllocationOfInitializedClassArray.ess 
	AllocationOfClassArray.ess AllocationOfClass.ess 
	AllocationOfClassArrayArray.ess 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

--- NEW FILE: AllocationOfPrimitiveArrayArray.ess ---
new int[null][]
--- NEW FILE: AllocationOfClassWithArguments.ess ---
new String(null)
--- NEW FILE: AllocationOfPrimitiveArray.ess ---
new int[null]
--- NEW FILE: AllocationOfInitializedClassArray.ess ---
new String[]
  {
  null,
  null,
  }

--- NEW FILE: AllocationOfClassArrayArray.ess ---
new String[null][]
--- NEW FILE: AllocationOfClassArray.ess ---
new String[null]
--- NEW FILE: AllocationOfClass.ess ---
new String()
--- NEW FILE: AllocationOfInitializedPrimitiveArray.ess ---
new float[]
  {
  null,
  null,
  }

[Endefr-cvs] endefr/tests unit-tests.xml,1.1.2.2,1.1.2.3

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests

Modified Files:
      Tag: Br1_01
	unit-tests.xml 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

Index: unit-tests.xml
===================================================================
RCS file: /cvsroot/endefr/endefr/tests/unit-tests.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** unit-tests.xml	14 Dec 2005 20:02:14 -0000	1.1.2.2
--- unit-tests.xml	16 Dec 2005 18:33:14 -0000	1.1.2.3
***************
*** 24,31 ****
    <test name="Script parser">
      <classes>
        <class name="endefr.tests.script.CommentTest"/>
        <class name="endefr.tests.script.ImportDeclarationTest"/>
        <class name="endefr.tests.script.ScriptIdentifierTest"/>
-       <class name="endefr.tests.script.ClassExpressionTest"/>
      </classes>
    </test>
--- 24,35 ----
    <test name="Script parser">
      <classes>
+       <class name="endefr.tests.script.AllocationExpressionTest"/>
+       <class name="endefr.tests.script.ClassExpressionTest"/>
        <class name="endefr.tests.script.CommentTest"/>
+       <class name="endefr.tests.script.ExpressionInParenthesesTest"/>
        <class name="endefr.tests.script.ImportDeclarationTest"/>
+       <class name="endefr.tests.script.LiteralExpressionTest"/>
+       <class name="endefr.tests.script.MethodInvocationTest"/>
        <class name="endefr.tests.script.ScriptIdentifierTest"/>
      </classes>
    </test>

[Endefr-cvs] endefr/tests/files/script.ExpressionInParenthesesTest ExpressionInParentheses.ess,NONE,1.1.2.1

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.ExpressionInParenthesesTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests/files/script.ExpressionInParenthesesTest

Added Files:
      Tag: Br1_01
	ExpressionInParentheses.ess 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

--- NEW FILE: ExpressionInParentheses.ess ---
(null)

[Endefr-cvs] endefr/tests/files/script.CommentTest EmptyMultilineComment.ess,NONE,1.1.2.1 MultilineCommentAfterStatement.ess,NONE,1.1.2.1 ArbitraryNumberOfAsterisksAtEnd.ess,NONE,1.1.2.1 EndOfLineCommentSplitsStatement.ess,NONE,1.1.2.1 EmptyJavadocComment.ess,NONE,1.1.2.1 ArbitraryNumberOfAsterisksAtStart.ess,NONE,1.1.2.1 StatementAfterMultilineCommentAllowed.ess,NONE,1.1.2.1 EndOfLineCommentAtStartOfLine.ess,NONE,1.1.2.1 MultilineCommentSplitsStatement.ess,NONE,1.1.2.1 MultilineCommentAtStartOfLine.ess,NONE,1.1.2.1 EndOfLineCommentAfterStatement.ess,NONE,1.1.2.1 NonEmptyJavadocComment.ess,NONE,1.1.2.1 EndOfLineCommentAfterStatement.ecs,1.1.2.1,NONE NonEmptyJavadocComment.ecs,1.1.2.1,NONE EndOfLineCommentAtStartOfLine.ecs,1.1.2.1,NONE EmptyMultilineComment.ecs,1.1.2.1,NONE StatementAfterMultilineCommentAllowed.ecs,1.1.2.1,NONE EndOfLineCommentSplitsStatement.ecs,1.1.2.1,NONE MultilineCommentAfterStatement.ecs,1.1.2.1,NONE MultilineCommentAtStartOfLine.ecs,1.1.2.1,NONE EmptyJavadocComment.ecs,1.1.2.1,NONE ArbitraryNumberOfAsterisksAtStart.ecs,1.1.2.1,NONE MultilineCommentSplitsStatement.ecs,1.1.2.1,NONE ArbitraryNumberOfAsterisksAtEnd.ecs,1.1.2.1,NONE

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.CommentTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests/files/script.CommentTest

Added Files:
      Tag: Br1_01
	EmptyMultilineComment.ess MultilineCommentAfterStatement.ess 
	ArbitraryNumberOfAsterisksAtEnd.ess 
	EndOfLineCommentSplitsStatement.ess EmptyJavadocComment.ess 
	ArbitraryNumberOfAsterisksAtStart.ess 
	StatementAfterMultilineCommentAllowed.ess 
	EndOfLineCommentAtStartOfLine.ess 
	MultilineCommentSplitsStatement.ess 
	MultilineCommentAtStartOfLine.ess 
	EndOfLineCommentAfterStatement.ess NonEmptyJavadocComment.ess 
Removed Files:
      Tag: Br1_01
	EndOfLineCommentAfterStatement.ecs NonEmptyJavadocComment.ecs 
	EndOfLineCommentAtStartOfLine.ecs EmptyMultilineComment.ecs 
	StatementAfterMultilineCommentAllowed.ecs 
	EndOfLineCommentSplitsStatement.ecs 
	MultilineCommentAfterStatement.ecs 
	MultilineCommentAtStartOfLine.ecs EmptyJavadocComment.ecs 
	ArbitraryNumberOfAsterisksAtStart.ecs 
	MultilineCommentSplitsStatement.ecs 
	ArbitraryNumberOfAsterisksAtEnd.ecs 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

--- ArbitraryNumberOfAsterisksAtStart.ecs DELETED ---

--- NEW FILE: EmptyMultilineComment.ess ---
/**/
dummy;
# dummy
dummy;
--- NEW FILE: EmptyJavadocComment.ess ---
/***/
dummy;
# dummy
dummy;
--- NEW FILE: NonEmptyJavadocComment.ess ---
/**Javadoc comment */
dummy;
# dummy
dummy;
--- NEW FILE: EndOfLineCommentAtStartOfLine.ess ---
// At start of line
dummy;
# dummy
dummy;
--- NEW FILE: MultilineCommentAfterStatement.ess ---
import java.util.Properties; /*
   After statement */
dummy;
# dummy
dummy;
--- NEW FILE: EndOfLineCommentAfterStatement.ess ---
import java.util.Set; // After statement
dummy;
# dummy
dummy;
--- EmptyMultilineComment.ecs DELETED ---

--- EmptyJavadocComment.ecs DELETED ---

--- NonEmptyJavadocComment.ecs DELETED ---

--- MultilineCommentSplitsStatement.ecs DELETED ---

--- EndOfLineCommentAtStartOfLine.ecs DELETED ---

--- MultilineCommentAfterStatement.ecs DELETED ---

--- NEW FILE: StatementAfterMultilineCommentAllowed.ess ---
/* Statement after this commen */import java.sql.Statement;
dummy;
# dummy
dummy;
--- NEW FILE: EndOfLineCommentSplitsStatement.ess ---
import // Split statement
java.util.List;
dummy;
# dummy
dummy;
--- StatementAfterMultilineCommentAllowed.ecs DELETED ---

--- EndOfLineCommentAfterStatement.ecs DELETED ---

--- NEW FILE: ArbitraryNumberOfAsterisksAtEnd.ess ---
/*
   Arbitrary number of asterisks at start
*******/
dummy;
# dummy
dummy;
--- NEW FILE: MultilineCommentAtStartOfLine.ess ---
/*
   At start of line
*/
dummy;
# dummy
dummy;
--- EndOfLineCommentSplitsStatement.ecs DELETED ---

--- NEW FILE: ArbitraryNumberOfAsterisksAtStart.ess ---
/*******
   Arbitrary number of asterisks at start
*/
dummy;
# dummy
dummy;
--- MultilineCommentAtStartOfLine.ecs DELETED ---

--- ArbitraryNumberOfAsterisksAtEnd.ecs DELETED ---

--- NEW FILE: MultilineCommentSplitsStatement.ess ---
import /*
   Split statement
*/ java.sql.SQLException;
dummy;
# dummy
dummy;

[Endefr-cvs] endefr/tests/files/script.ScriptIdentifierTest ScriptWithSingleIdentifier.ess,NONE,1.1.2.1 NoWhitespaceBeforeIdentifier.ess,NONE,1.1.2.1 ScriptWithoutIdentifiers.ess,NONE,1.1.2.1 ScriptWithDuplicateIdentifiers.ess,NONE,1.1.2.1 ArbitrayNumberOfPoundSigns.ess,NONE,1.1.2.1 WhitespaceBeforeIdentifier.ess,NONE,1.1.2.1 ScriptWithMultipleIdentifiers.ess,NONE,1.1.2.1 ScriptWithDuplicateIdentifiers.ecs,1.1.2.1,NONE ScriptWithoutIdentifiers.ecs,1.1.2.1,NONE NoWhitespaceBeforeIdentifier.ecs,1.1.2.1,NONE ScriptWithMultipleIdentifiers.ecs,1.1.2.1,NONE ArbitrayNumberOfPoundSigns.ecs,1.1.2.1,NONE ScriptWithSingleIdentifier.ecs,1.1.2.1,NONE WhitespaceBeforeIdentifier.ecs,1.1.2.1,NONE

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.ScriptIdentifierTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests/files/script.ScriptIdentifierTest

Added Files:
      Tag: Br1_01
	ScriptWithSingleIdentifier.ess 
	NoWhitespaceBeforeIdentifier.ess ScriptWithoutIdentifiers.ess 
	ScriptWithDuplicateIdentifiers.ess 
	ArbitrayNumberOfPoundSigns.ess WhitespaceBeforeIdentifier.ess 
	ScriptWithMultipleIdentifiers.ess 
Removed Files:
      Tag: Br1_01
	ScriptWithDuplicateIdentifiers.ecs 
	ScriptWithoutIdentifiers.ecs NoWhitespaceBeforeIdentifier.ecs 
	ScriptWithMultipleIdentifiers.ecs 
	ArbitrayNumberOfPoundSigns.ecs ScriptWithSingleIdentifier.ecs 
	WhitespaceBeforeIdentifier.ecs 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

--- NEW FILE: WhitespaceBeforeIdentifier.ess ---
dummy;
# 	 withWhitespace
dummy;
--- NEW FILE: NoWhitespaceBeforeIdentifier.ess ---
dummy;
#noWhitespace
dummy;
--- NEW FILE: ScriptWithMultipleIdentifiers.ess ---
dummy;
# first
dummy;
# second dummy;# third
dummy;
--- NEW FILE: ArbitrayNumberOfPoundSigns.ess ---
dummy;
######## multiplePoundSigns
dummy;

--- NEW FILE: ScriptWithDuplicateIdentifiers.ess ---
# again
// and
#again

--- ScriptWithoutIdentifiers.ecs DELETED ---

--- NEW FILE: ScriptWithSingleIdentifier.ess ---
dummy;
# onlyOne
dummy;
--- WhitespaceBeforeIdentifier.ecs DELETED ---

--- ScriptWithDuplicateIdentifiers.ecs DELETED ---

--- NoWhitespaceBeforeIdentifier.ecs DELETED ---

--- ScriptWithMultipleIdentifiers.ecs DELETED ---

--- ArbitrayNumberOfPoundSigns.ecs DELETED ---

--- NEW FILE: ScriptWithoutIdentifiers.ess ---

--- ScriptWithSingleIdentifier.ecs DELETED ---

[Endefr-cvs] endefr/tests/files/script.ImportDeclarationTest OneImportDeclaration.ess,NONE,1.1.2.1 NoImportDeclaration.ess,NONE,1.1.2.1 WildcardImportDeclaration.ess,NONE,1.1.2.1 MultipleImportDeclarations.ess,NONE,1.1.2.1 ImportDeclarationIsAddedToCompoundScript.ess,NONE,1.1.2.1 OneImportDeclaration.ecs,1.1.2.1,NONE NoImportDeclaration.ecs,1.1.2.1,NONE ImportDeclarationIsAddedToCompoundScript.ecs,1.1.2.1,NONE MultipleImportDeclarations.ecs,1.1.2.1,NONE WildcardImportDeclaration.ecs,1.1.2.1,NONE

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.ImportDeclarationTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests/files/script.ImportDeclarationTest

Added Files:
      Tag: Br1_01
	OneImportDeclaration.ess NoImportDeclaration.ess 
	WildcardImportDeclaration.ess MultipleImportDeclarations.ess 
	ImportDeclarationIsAddedToCompoundScript.ess 
Removed Files:
      Tag: Br1_01
	OneImportDeclaration.ecs NoImportDeclaration.ecs 
	ImportDeclarationIsAddedToCompoundScript.ecs 
	MultipleImportDeclarations.ecs WildcardImportDeclaration.ecs 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

--- NEW FILE: ImportDeclarationIsAddedToCompoundScript.ess ---
import java.util.Random;
dummy;
# dummy
dummy;
--- ImportDeclarationIsAddedToCompoundScript.ecs DELETED ---

--- NEW FILE: OneImportDeclaration.ess ---
import java.sql.Connection;

dummy;
# dummy
dummy;

--- MultipleImportDeclarations.ecs DELETED ---

--- WildcardImportDeclaration.ecs DELETED ---

--- NEW FILE: NoImportDeclaration.ess ---
dummy;
# dummy
dummy;
--- OneImportDeclaration.ecs DELETED ---

--- NoImportDeclaration.ecs DELETED ---

--- NEW FILE: MultipleImportDeclarations.ess ---
import java.util.Map;
import java.text.SimpleDateFormat;
import java.lang.reflect.Method;
dummy;
# dummy
dummy;
--- NEW FILE: WildcardImportDeclaration.ess ---
import java.util.*;

# dummy

[Endefr-cvs] endefr/tests/files/script.MethodInvocationTest MethodInvocationWithMultipleArguments.ess,NONE,1.1.2.1 MethodInvocationWithOneArgument.ess,NONE,1.1.2.1 MethodInvocationWithoutArguments.ess,NONE,1.1.2.1

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.MethodInvocationTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests/files/script.MethodInvocationTest

Added Files:
      Tag: Br1_01
	MethodInvocationWithMultipleArguments.ess 
	MethodInvocationWithOneArgument.ess 
	MethodInvocationWithoutArguments.ess 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

--- NEW FILE: MethodInvocationWithoutArguments.ess ---
run()
--- NEW FILE: MethodInvocationWithMultipleArguments.ess ---
run(null, null, null)
--- NEW FILE: MethodInvocationWithOneArgument.ess ---
run(null)

[Endefr-cvs] endefr/tests/files/script.ClassExpressionTest PrimitiveArrayClass.ess,NONE,1.1.2.1 VoidClass.ess,NONE,1.1.2.1 ClassOrInterfaceClass.ess,NONE,1.1.2.1 GenericClassOrInterfaceArrayClass.ess,NONE,1.1.2.1 PrimitiveClass.ess,NONE,1.1.2.1 VoidArrayClass.ess,NONE,1.1.2.1 ClassOrInterfaceArrayClass.ess,NONE,1.1.2.1 GenericClassOrInterfaceClass.ess,NONE,1.1.2.1 ClassOrInterfaceArrayClass.ecs,1.1.2.1,NONE VoidClass.ecs,1.1.2.1,NONE GenericClassOrInterfaceClass.ecs,1.1.2.1,NONE GenericClassOrInterfaceArrayClass.ecs,1.1.2.1,NONE VoidArrayClass.ecs,1.1.2.1,NONE ClassOrInterfaceClass.ecs,1.1.2.1,NONE PrimitiveClass.ecs,1.1.2.1,NONE PrimitiveArrayClass.ecs,1.1.2.1,NONE

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.ClassExpressionTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests/files/script.ClassExpressionTest

Added Files:
      Tag: Br1_01
	PrimitiveArrayClass.ess VoidClass.ess 
	ClassOrInterfaceClass.ess 
	GenericClassOrInterfaceArrayClass.ess PrimitiveClass.ess 
	VoidArrayClass.ess ClassOrInterfaceArrayClass.ess 
	GenericClassOrInterfaceClass.ess 
Removed Files:
      Tag: Br1_01
	ClassOrInterfaceArrayClass.ecs VoidClass.ecs 
	GenericClassOrInterfaceClass.ecs 
	GenericClassOrInterfaceArrayClass.ecs VoidArrayClass.ecs 
	ClassOrInterfaceClass.ecs PrimitiveClass.ecs 
	PrimitiveArrayClass.ecs 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

--- NEW FILE: GenericClassOrInterfaceClass.ess ---
List<String>.class
--- ClassOrInterfaceArrayClass.ecs DELETED ---

--- VoidArrayClass.ecs DELETED ---

--- NEW FILE: VoidClass.ess ---
void.class
--- NEW FILE: PrimitiveClass.ess ---
float.class
--- NEW FILE: ClassOrInterfaceClass.ess ---
String.class
--- GenericClassOrInterfaceArrayClass.ecs DELETED ---

--- NEW FILE: PrimitiveArrayClass.ess ---
boolean[].class
--- PrimitiveClass.ecs DELETED ---

--- GenericClassOrInterfaceClass.ecs DELETED ---

--- NEW FILE: ClassOrInterfaceArrayClass.ess ---
List[].class
--- NEW FILE: VoidArrayClass.ess ---
void[].class
--- VoidClass.ecs DELETED ---

--- ClassOrInterfaceClass.ecs DELETED ---

--- NEW FILE: GenericClassOrInterfaceArrayClass.ess ---
List<String>[].class
--- PrimitiveArrayClass.ecs DELETED ---

[Endefr-cvs] endefr/tests/files/script.LiteralExpressionTest StringLiteral.ess,NONE,1.1.2.1 64BitPositiveIntegerLiteral.ess,NONE,1.1.2.1 64BitPositiveFloatingPointLiteral.ess,NONE,1.1.2.1 PositiveIntegerLiteral.ess,NONE,1.1.2.1 CharacterLiteral.ess,NONE,1.1.2.1 BooleanLiteral.ess,NONE,1.1.2.1 PositiveFloatingPointLiteral.ess,NONE,1.1.2.1 NullLiteral.ess,NONE,1.1.2.1

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.LiteralExpressionTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657/tests/files/script.LiteralExpressionTest

Added Files:
      Tag: Br1_01
	StringLiteral.ess 64BitPositiveIntegerLiteral.ess 
	64BitPositiveFloatingPointLiteral.ess 
	PositiveIntegerLiteral.ess CharacterLiteral.ess 
	BooleanLiteral.ess PositiveFloatingPointLiteral.ess 
	NullLiteral.ess 
Log Message:
Refactored script parser tests so they are less influenced by changes to the syntax.

Added script parser tests.

--- NEW FILE: 64BitPositiveIntegerLiteral.ess ---
12345678901234L
--- NEW FILE: 64BitPositiveFloatingPointLiteral.ess ---
1234.5678E+9
--- NEW FILE: NullLiteral.ess ---
null
--- NEW FILE: StringLiteral.ess ---
"foo"
--- NEW FILE: PositiveIntegerLiteral.ess ---
1234
--- NEW FILE: CharacterLiteral.ess ---
'@'
--- NEW FILE: PositiveFloatingPointLiteral.ess ---
1234.5678E+9F
--- NEW FILE: BooleanLiteral.ess ---
false

[Endefr-cvs] endefr/tests/files/script.ExpressionInParenthesesTest - New directory

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.ExpressionInParenthesesTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3608/tests/files/script.ExpressionInParenthesesTest

Log Message:
Directory /cvsroot/endefr/endefr/tests/files/script.ExpressionInParenthesesTest added to the repository
--> Using per-directory sticky tag `Br1_01'

[Endefr-cvs] endefr/tests/files/script.MethodInvocationTest - New directory

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.MethodInvocationTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3608/tests/files/script.MethodInvocationTest

Log Message:
Directory /cvsroot/endefr/endefr/tests/files/script.MethodInvocationTest added to the repository
--> Using per-directory sticky tag `Br1_01'

[Endefr-cvs] endefr/tests/files/script.AllocationExpressionTest - New directory

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.AllocationExpressionTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3608/tests/files/script.AllocationExpressionTest

Log Message:
Directory /cvsroot/endefr/endefr/tests/files/script.AllocationExpressionTest added to the repository
--> Using per-directory sticky tag `Br1_01'

[Endefr-cvs] endefr/tests/files/script.LiteralExpressionTest - New directory

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/tests/files/script.LiteralExpressionTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3608/tests/files/script.LiteralExpressionTest

Log Message:
Directory /cvsroot/endefr/endefr/tests/files/script.LiteralExpressionTest added to the repository
--> Using per-directory sticky tag `Br1_01'

[Endefr-cvs] endefr/coding-standard/pmd endefr.xml,1.1.2.1,1.1.2.2

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/coding-standard/pmd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3278/coding-standard/pmd

Modified Files:
      Tag: Br1_01
	endefr.xml 
Log Message:
Added Endefr-specific coding standards.

Index: endefr.xml
===================================================================
RCS file: /cvsroot/endefr/endefr/coding-standard/pmd/Attic/endefr.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** endefr.xml	14 Dec 2005 20:02:16 -0000	1.1.2.1
--- endefr.xml	16 Dec 2005 18:31:40 -0000	1.1.2.2
***************
*** 150,154 ****
    <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
    <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
!     
  </ruleset>
- 
--- 150,333 ----
    <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
    <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
!   
!   <!-- Unwanted constructs -->
!   <rule name="PreIncrementExpression"
!     message="Do not use pre- and postfix expressions (pre-increment expression)."
!     class="net.sourceforge.pmd.rules.XPathRule">
!     <decription>
! Pre- and postfix expressions have side effects. Use statements and expressions
! without side effects instead.
!     </decription>
!     <properties>
!       <property name="xpath">
!         <value>
!           <![CDATA[
!             //PreIncrementExpression
!           ]]>
!         </value>
!       </property>
!       <priority>3</priority>
!       <example>
!         <![CDATA[
! for (int i = 0; i < 10; ++i)
! {
!   // Statements
! }
!         ]]>
!       </example>
!     </properties>
!   </rule>
!   
!   <rule name="PreDecrementExpression"
!     message="Do not use pre- and postfix expressions (pre-decrement expression)."
!     class="net.sourceforge.pmd.rules.XPathRule">
!     <decription>
! Pre- and postfix expressions have side effects. Use statements and expressions
! without side effects instead.
!     </decription>
!     <properties>
!       <property name="xpath">
!         <value>
!           <![CDATA[
!             //PreDecrementExpression
!           ]]>
!         </value>
!       </property>
!       <priority>3</priority>
!       <example>
!         <![CDATA[
! for (int i = 0; i < 10; --i)
! {
!   // Statements
! }
!         ]]>
!       </example>
!     </properties>
!   </rule>
!   
!   <rule name="PostfixExpression"
!     message="Do not use pre- and postfix expressions (postfix expression)."
!     class="net.sourceforge.pmd.rules.XPathRule">
!     <decription>
! Pre- and postfix expressions have side effects. Use statements and expressions
! without side effects instead.
!     </decription>
!     <properties>
!       <property name="xpath">
!         <value>
!           <![CDATA[
!             //PostfixExpression
!           ]]>
!         </value>
!       </property>
!       <priority>3</priority>
!       <example>
!         <![CDATA[
! for (int i = 0; i < 10; i++)
! {
!   // Statements
! }
!         ]]>
!       </example>
!     </properties>
!   </rule>
!   
!   <rule name="LabeledStatement"
!     message="Do not use labeled statements."
!     class="net.sourceforge.pmd.rules.XPathRule">
!     <decription>
! Labeled statements are used with break and continue statements. Together they
! provide flow control. This flow control is unstructured and difficult to read.
! Use structured flow control statements like for, while and do instead.
!     </decription>
!     <properties>
!       <property name="xpath">
!         <value>
!           <![CDATA[
!             //LabeledStatement
!           ]]>
!         </value>
!       </property>
!       <priority>3</priority>
!       <example>
!         <![CDATA[
! FIXME
!         ]]>
!       </example>
!     </properties>
!   </rule>
!   
!   <rule name="BreakStatement"
!     message="Do not use break statements."
!     class="net.sourceforge.pmd.rules.XPathRule">
!     <decription>
! Break statements are used for flow control. This flow control is unstructured
! and difficult to read. Use structured flow control statements like for, while
! and do instead.
!     </decription>
!     <properties>
!       <property name="xpath">
!         <value>
!           <![CDATA[
!             //BreakStatement[not(parent::Statement/parent::BlockStatement/parent::SwitchStatement)]
!           ]]>
!         </value>
!       </property>
!       <priority>3</priority>
!       <example>
!         <![CDATA[
! FIXME
!         ]]>
!       </example>
!     </properties>
!   </rule>
!   
!   <rule name="ContinueStatement"
!     message="Do not use continue statements."
!     class="net.sourceforge.pmd.rules.XPathRule">
!     <decription>
! Continue statements are used for flow control. This flow control is unstructured
! and difficult to read. Use structured flow control statements like for, while
! and do instead.
!     </decription>
!     <properties>
!       <property name="xpath">
!         <value>
!           <![CDATA[
!             //ContinueStatement
!           ]]>
!         </value>
!       </property>
!       <priority>3</priority>
!       <example>
!         <![CDATA[
! FIXME
!         ]]>
!       </example>
!     </properties>
!   </rule>
!   
!   <rule name="InnerTypes"
!     message="Do not use inner classes or interfaces."
!     class="net.sourceforge.pmd.rules.XPathRule">
!     <decription>
! Inner types have a very limited purpose. What they were meant for can just as
! well be solved using standard types.
!     </decription>
!     <properties>
!       <property name="xpath">
!         <value>
!           <![CDATA[
!             //ClassOrInterfaceDeclaration[@Nested = 'true' or parent::BlockStatement]
!           ]]>
!         </value>
!       </property>
!       <priority>3</priority>
!       <example>
!         <![CDATA[
! FIXME
!         ]]>
!       </example>
!     </properties>
!   </rule>
  </ruleset>

[Endefr-cvs] endefr/source/javacc EndefrScriptParser.jj,1.1.2.2,1.1.2.3

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/source/javacc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3200/source/javacc

Modified Files:
      Tag: Br1_01
	EndefrScriptParser.jj 
Log Message:
Added production for tests.

Added FIXME comment for allocation expressions for inner classes.

Index: EndefrScriptParser.jj
===================================================================
RCS file: /cvsroot/endefr/endefr/source/javacc/Attic/EndefrScriptParser.jj,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** EndefrScriptParser.jj	14 Dec 2005 20:02:13 -0000	1.1.2.2
--- EndefrScriptParser.jj	16 Dec 2005 18:31:06 -0000	1.1.2.3
***************
*** 470,473 ****
--- 470,485 ----
   */
   
+ /**
+  * <p>
+  * This production is used in tests.
+  * </p>
+  */
+ void endOfFile() :
+   {
+   }
+   {
+   <EOF>
+   }
+  
  CompoundScript compoundScript() :
    {
***************
*** 673,676 ****
--- 685,689 ----
    "."
      (
+     // FIXME: this is too liberal. Only class allocations are allowed.
      allocationExpression()
        [

[Endefr-cvs] endefr/source/public/org/endefr/application AbstractEndefrApplication.java,1.1.2.1,1.1.2.2 TestEndefrApplication.java,1.1.2.1,1.1.2.2

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/source/public/org/endefr/application
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7423/source/public/org/endefr/application

Modified Files:
      Tag: Br1_01
	AbstractEndefrApplication.java TestEndefrApplication.java 
Log Message:
Included JAR file of JavaCC.

Extended parser source.

More tests.

Added PMD and created a ruleset importing rules included in PMD.

Index: AbstractEndefrApplication.java
===================================================================
RCS file: /cvsroot/endefr/endefr/source/public/org/endefr/application/Attic/AbstractEndefrApplication.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** AbstractEndefrApplication.java	7 Dec 2005 19:39:50 -0000	1.1.2.1
--- AbstractEndefrApplication.java	14 Dec 2005 20:02:12 -0000	1.1.2.2
***************
*** 22,25 ****
--- 22,30 ----
      {
      super();
+     
+     // TODO: implement or document.
      }
+   
+   // TODO: remove
+   protected abstract void dummy();
    }

Index: TestEndefrApplication.java
===================================================================
RCS file: /cvsroot/endefr/endefr/source/public/org/endefr/application/Attic/TestEndefrApplication.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** TestEndefrApplication.java	7 Dec 2005 19:39:50 -0000	1.1.2.1
--- TestEndefrApplication.java	14 Dec 2005 20:02:12 -0000	1.1.2.2
***************
*** 24,27 ****
--- 24,29 ----
      {
      super();
+     
+     // TODO: implement or document.
      }
  
***************
*** 29,32 ****
--- 31,40 ----
    public static void main(String[] pArguments)
      {
+     // TODO: implement.
+     }
+   
+   protected void dummy()
+     {
+     // TODO: remove this method after removal in superclass.
      }
    }

[Endefr-cvs] endefr/source/documentation manual-first-steps.html,1.1.2.3,1.1.2.4 manual-introduction.html,1.1.2.3,1.1.2.4 index.html,1.3,1.3.2.1

[Johan S. <js...@us...>]

Update of /cvsroot/endefr/endefr/source/documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7423/source/documentation

Modified Files:
      Tag: Br1_01
	manual-first-steps.html manual-introduction.html index.html 
Log Message:
Included JAR file of JavaCC.

Extended parser source.

More tests.

Added PMD and created a ruleset importing rules included in PMD.

Index: manual-first-steps.html
===================================================================
RCS file: /cvsroot/endefr/endefr/source/documentation/Attic/manual-first-steps.html,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** manual-first-steps.html	7 Dec 2005 20:12:05 -0000	1.1.2.3
--- manual-first-steps.html	14 Dec 2005 20:02:13 -0000	1.1.2.4
***************
*** 16,23 ****
      <p>This chapter will introduce you to how the configuration is specified and how you can start Endefr.</p>
  
!     <h2>Simple entities</h2>
  
!     <p>Lets create a simple entitiy containing the port number on which a HTTP server should listen. Create the
!     following directory structure (directories are in bold):</p>
  
      <ul>
--- 16,24 ----
      <p>This chapter will introduce you to how the configuration is specified and how you can start Endefr.</p>
  
!     <h2>Primitive entities</h2>
  
!     <p>Unlike other containers Endefr has full support for primitive values. Lets create a primitive entitiy
!     containing the port number on which a HTTP server should listen. Create the following directory structure
!     (directories are in bold):</p>
  
      <ul>
***************
*** 57,61 ****
      script that defines the HTTP port entity:</p>
  
!     <pre>result = 8080;</pre>
  
      <p>When the container would be started now, there would be one entity named <code>httpPort</code> in the
--- 58,74 ----
      script that defines the HTTP port entity:</p>
  
!     <pre>create();
! # create
! result = 8080;</pre>
! 
!     <p>Scripts have the following structure:</p>
! 
!     <ul>
!       <li>import statements. Not present in this example;</li>
! 
!       <li>one lifecycle description script. In this example:<pre>create();</pre></li>
! 
!       <li>one or more life stage scripts. In this example a single script called <code>create</code>:<pre>result = 8080;</pre></li>
!     </ul>
  
      <p>When the container would be started now, there would be one entity named <code>httpPort</code> in the
***************
*** 94,97 ****
--- 107,112 ----
      <pre>import java.util.HashMap;
  
+ create();
+ # create
  result = new HashMap();</pre>
  

Index: index.html
===================================================================
RCS file: /cvsroot/endefr/endefr/source/documentation/index.html,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** index.html	9 Nov 2005 14:25:33 -0000	1.3
--- index.html	14 Dec 2005 20:02:13 -0000	1.3.2.1
***************
*** 38,42 ****
        <dt>Endefr does not require implementing an API</dt>
  
!       <dd>The cube is made up out of shaped blocks.</dd>
  
        <dt>The configurations are modular, overrideable and extensible</dt>
--- 38,42 ----
        <dt>Endefr does not require implementing an API</dt>
  
!       <dd>The blocks of the cube have different shapes.</dd>
  
        <dt>The configurations are modular, overrideable and extensible</dt>

Index: manual-introduction.html
===================================================================
RCS file: /cvsroot/endefr/endefr/source/documentation/Attic/manual-introduction.html,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** manual-introduction.html	7 Dec 2005 20:12:05 -0000	1.1.2.3
--- manual-introduction.html	14 Dec 2005 20:02:13 -0000	1.1.2.4
***************
*** 18,24 ****
      <p><i>Endefr</i> stands for <i>ENtity DEployment FRamework</i>. It is pronounced like <i>endeavor</i>. The term
      <i>entity deployment framework</i> describes the functionality of Endefr very well. <i>Entities</i> and
!     <i>deployment</i> must be interpreted as broad as possible: from primitive values to huge components and from
      single namespaces to complex, hierarchical, polymorphic namespace trees, respectively. Endefr does not provide any
!     additional services, but serves as the glue for existing solutions.</p>
  
      <p>This focused domain does not make Endefr an easy-to-implement framework. The internal structures of todays
--- 18,24 ----
      <p><i>Endefr</i> stands for <i>ENtity DEployment FRamework</i>. It is pronounced like <i>endeavor</i>. The term
      <i>entity deployment framework</i> describes the functionality of Endefr very well. <i>Entities</i> and
!     <i>deployment</i> must be interpreted as broad as possible: from primitive values to huge components, and from
      single namespaces to complex, hierarchical, polymorphic namespace trees, respectively. Endefr does not provide any
!     additional services, but serves as the glue for existing components.</p>
  
      <p>This focused domain does not make Endefr an easy-to-implement framework. The internal structures of todays
***************
*** 52,57 ****
  
      <p>Most frameworks are limited in the types of lifecycles they can handle. This results in requiring you to write
!     adapters for your and third-party components before you can deploy them in the framework. This doubles the number
!     of APIs users of the components have to learn.</p>
  
      <p>Some frameworks only manage components which implement framework-specific interfaces. Your components become
--- 52,57 ----
  
      <p>Most frameworks are limited in the types of lifecycles they can handle. This results in requiring you to write
!     adapters for your and for third-party components before you can deploy them in the framework. This doubles the
!     number of APIs users of the components have to learn.</p>
  
      <p>Some frameworks only manage components which implement framework-specific interfaces. Your components become