Revision: 3848
http://bigdata.svn.sourceforge.net/bigdata/?rev=3848&view=rev
Author: dmacgbr
Date: 2010-10-27 16:25:14 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
Modified to make compatible with changes made to AbstractTransactionService in revision 3804
Revision Links:
--------------
http://bigdata.svn.sourceforge.net/bigdata/?rev=3804&view=rev
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestTransactionService.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestTransactionService.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestTransactionService.java 2010-10-27 10:27:22 UTC (rev 3847)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestTransactionService.java 2010-10-27 16:25:14 UTC (rev 3848)
@@ -40,7 +40,6 @@
import com.bigdata.service.AbstractTransactionService;
import com.bigdata.service.CommitTimeIndex;
import com.bigdata.service.TxServiceRunState;
-import com.bigdata.util.MillisecondTimestampFactory;
/**
* Unit tests of the {@link AbstractTransactionService} using a mock client.
@@ -271,11 +270,8 @@
@Override
public long nextTimestamp() {
- // skip at least one millisecond.
- MillisecondTimestampFactory.nextMillis();
-
- return MillisecondTimestampFactory.nextMillis();
-
+ super.nextTimestamp () ;
+ return super.nextTimestamp () ;
}
}
@@ -909,7 +905,12 @@
*/
try {
- service.newTx(10);
+ /**
+ * FIXME Modified to be compatible with changes made to AbstractTransactionService, revision 3804.
+ * @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/187">Trac 187</a>
+ */
+// service.newTx(10);
+ service.newTx(service.nextTimestamp () + 10);
fail("Expecting: "+IllegalStateException.class);
} catch(IllegalStateException ex) {
log.info("Ignoring expected exception: "+ex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
