Added tests for some of the functions in koala.dynamicjava.tree.*Literal, mainly the decoding functions

evlich · evlich · commit bc2ff71530c4 · 2005-02-06T03:50:51.000Z
git-svn-id: file:///tmp/test-svn/trunk@2868 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/koala/Version.java b/dynamicjava/src/koala/Version.java
@@ -53,7 +53,7 @@
  * This file is copied to Version.java by the build process, which also
  * fills in the right values of the date and time.
  *
- * This javadoc corresponds to build drjava-20050205-0300;
+ * This javadoc corresponds to build drjava-20050206-0349;
  *
  * @version $Id$
  */
@@ -62,7 +62,7 @@ public abstract class Version {
    * This string will be automatically expanded upon "ant commit".
    * Do not edit it by hand!
    */
-  private static final String BUILD_TIME_STRING = "20050205-0300";
+  private static final String BUILD_TIME_STRING = "20050206-0349";
 
   /** A {@link Date} version of the build time. */
   private static final Date BUILD_TIME = _getBuildDate();
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/TypeCheckerTest.java b/dynamicjava/src/koala/dynamicjava/interpreter/TypeCheckerTest.java
@@ -256,6 +256,18 @@ public void testVisitWhileStatement() throws InterpreterException {
     assertEquals("Should have autounboxed", expected, actual);
     
     _interpretText(text);
+    
+    text = "while (new Character('a')) { }";
+    stmt = _parseCode(text).get(0);
+    
+    try {
+      stmt.acceptVisitor(_typeChecker);
+      fail("shouldn't allow while statement with character");
+    }
+    catch (ExecutionError e) {
+      //Test Passed
+    }
+
   }
   
   /**
@@ -272,6 +284,17 @@ public void testVisitDoStatement() throws InterpreterException {
     assertEquals("Should have autounboxed", expected, actual);
     
     _interpretText(text);
+    
+    text = "do { } while( 'a' );";
+    stmt = _parseCode(text).get(0);
+    try {
+      stmt.acceptVisitor(_typeChecker);
+      fail("shouldn't accept integer for boolean expression");
+    }
+    catch (ExecutionError e) {
+      //Test Passed
+    }
+    
   }  
   
   /**
@@ -290,6 +313,16 @@ public void testVisitForStatement() throws InterpreterException {
     assertEquals("Should have autounboxed", expected, actual);
 
     _interpretText(text);
+    
+    text = "for(; new Integer(5););";
+    stmt = _parseCode(text).get(0);
+    try {
+      stmt.acceptVisitor(_typeChecker);
+      fail("shouldn't accept integer for boolean expression");
+    }
+    catch (ExecutionError e) {
+      //Test Passed
+    }    
   }
   
   /**
@@ -547,7 +580,20 @@ public void testLabeledStatement() {
     assertEquals("should yield label statement", expected, actual);
     stmt.acceptVisitor(_typeChecker);
   }
-*/  
+*/
+  
+  public void testSynchronizedStatement() { 
+    String text = "synchronized (Integer.class) { }";
+    SynchronizedStatement stmt = (SynchronizedStatement)_parseCode(text).get(0);
+    
+    String expected = "(koala.dynamicjava.tree.BlockStatement: [])";
+    String actual = stmt.getBody().toString();
+    assertEquals("body of synchronized should be empty", expected, actual);
+    expected = "(koala.dynamicjava.tree.TypeExpression: (koala.dynamicjava.tree.ReferenceType: Integer))";
+    actual = stmt.getLock().toString();
+    assertEquals("should be locking on Class object", expected, actual);
+  }
+  
   public void testIfThenStatement() throws InterpreterException {
     String text = "if (B) { }";
     IfThenStatement stmt = (IfThenStatement) _parseCode(text).get(0);
diff --git a/dynamicjava/src/koala/dynamicjava/util/FileFinderTest.java b/dynamicjava/src/koala/dynamicjava/util/FileFinderTest.java
@@ -58,33 +58,41 @@ public class FileFinderTest extends TestCase
   
   public FileFinderTest(){}
   
-  public void testFindFile()
-  {
+  public void testFindFile() {
     File thisFile;
     File noFile;
     
     //When running the ant script for testing this is the relative path to the directory that contains this file
     ff.addPath("dynamicjava/util/");
     
     //Try to find a file that does exist, namely this current file
-    try
-    {
+    try {
       thisFile = ff.findFile("FileFinderTest.java");
       assertTrue("Found This File", thisFile != null);
     }
-    catch(IOException ioe)
-    {
+    catch(IOException ioe) {
       fail();
     }
     
+    //When running the ant script for testing this is the relative path to the directory that contains this file
+    ff.addPath("dynamicjava/interpreter");
+    
+    //Try to find a file that does exist, namely this current file
+    try {
+      thisFile = ff.findFile("Interpreter.java");
+      assertTrue("Found This File", thisFile != null);
+    }
+    catch(IOException ioe) {
+      fail();
+    }
+    
+    
     //Try to find a file that does not exist
-    try
-    {
+    try {
       noFile = ff.findFile("file.doesnotexist");
       fail();
     }
-    catch(IOException fnf)
-    {
+    catch(IOException fnf) {
       assertEquals("File Not Found", "File Not Found: file.doesnotexist", fnf.getMessage());
     }
   }
