[Bigdata-commit] SF.net SVN: bigdata:[3667] branches/bbb_cleanup/bigdata-core/src

[<res...@us...>]

Revision: 3667
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3667&view=rev
Author:   resendes
Date:     2010-09-28 18:10:39 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
Some changes for a cleaner run:
- CSVReader javadoc reference fix
- NT dead code removal
- TestMillisecondTimestampFactory added tearDown() method that resets the lowerbound of the global, static MillisecondTimestampFactory. This was needed because some of the unit tests were checking boundary conditions that were "persisted" to other tests (all executing under the same JVM).

Modified Paths:
--------------
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/util/CSVReader.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/util/NT.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/util/TestMillisecondTimestampFactory.java

Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/util/CSVReader.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/util/CSVReader.java	2010-09-28 17:02:48 UTC (rev 3666)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/util/CSVReader.java	2010-09-28 18:10:39 UTC (rev 3667)
@@ -291,7 +291,7 @@
      * The header definitions (initially null).
      * 
      * @see #readHeaders()
-     * @see #setHeaders(String[])
+     * @see #setHeaders(Header[])
      */
     protected Header[] headers;
 

Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/util/NT.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/util/NT.java	2010-09-28 17:02:48 UTC (rev 3666)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/util/NT.java	2010-09-28 18:10:39 UTC (rev 3667)
@@ -84,9 +84,6 @@
         }
         NT nt = (NT)o;
         
-        if (this == nt)
-            return true;
-
         if (!this.name.equals(nt.name))
             return false;
 

Modified: branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/util/TestMillisecondTimestampFactory.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/util/TestMillisecondTimestampFactory.java	2010-09-28 17:02:48 UTC (rev 3666)
+++ branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/util/TestMillisecondTimestampFactory.java	2010-09-28 18:10:39 UTC (rev 3667)
@@ -185,4 +185,14 @@
 	        assertFalse(MillisecondTimestampFactory.isAutoIncMode());
         }
     }
+    
+    /**
+     * Reset "global" time back to normal after each run. Because 
+     *  MillisecondTimestampFactory is static, changes made in these
+     *  tests will affect other tests in the same JVM. Therefore, need to
+     *  reset value back to current time after each run.
+     */
+    protected void tearDown() throws Exception {
+    	MillisecondTimestampFactory.setLowerBound(System.currentTimeMillis());
+	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.