[jboss-cvs] JBoss Messaging SVN: r7459 - branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/unit/core/journal/impl.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 24 17:37:14 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-06-24 17:37:13 -0400 (Wed, 24 Jun 2009)
New Revision: 7459
Modified:
branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java
Log:
Fixing test
Modified: branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java
===================================================================
--- branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java 2009-06-24 21:16:19 UTC (rev 7458)
+++ branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java 2009-06-24 21:37:13 UTC (rev 7459)
@@ -159,7 +159,7 @@
{
final int JOURNAL_SIZE = 1060;
- setupJournal(JOURNAL_SIZE, 10);
+ setupAndLoadJournal(JOURNAL_SIZE, 10);
journalImpl.appendAddRecord(13, (byte)14, new SimpleEncoding(1, (byte)15), false);
@@ -167,7 +167,7 @@
journalImpl.checkAndReclaimFiles();
- setupJournal(JOURNAL_SIZE, 10);
+ setupAndLoadJournal(JOURNAL_SIZE, 10);
assertEquals(1, records.size());
@@ -186,7 +186,7 @@
final int JOURNAL_SIZE = 1060;
- setupJournal(JOURNAL_SIZE, 10);
+ setupAndLoadJournal(JOURNAL_SIZE, 10);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -207,7 +207,7 @@
journalImpl.appendAddRecord(i * 100l, (byte)i, support, false);
}
- setupJournal(JOURNAL_SIZE, 1024);
+ setupAndLoadJournal(JOURNAL_SIZE, 1024);
assertEquals(50, records.size());
@@ -236,7 +236,7 @@
journalImpl.appendUpdateRecord(i * 100l, (byte)i, bytes, false);
}
- setupJournal(JOURNAL_SIZE, 1024);
+ setupAndLoadJournal(JOURNAL_SIZE, 1024);
i = 0;
for (RecordInfo recordItem : records)
@@ -275,7 +275,7 @@
{
final int JOURNAL_SIZE = 10000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
journalImpl.setAutoReclaim(false);
@@ -309,7 +309,7 @@
journalImpl.debugWait();
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(10, records.size());
@@ -321,7 +321,7 @@
{
final int JOURNAL_SIZE = 10000;
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
journalImpl.setAutoReclaim(false);
@@ -359,7 +359,7 @@
assertEquals(3, factory.listFiles("tt").size());
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(1, records.size());
@@ -385,14 +385,14 @@
{
final int JOURNAL_SIZE = 2000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
journalImpl.appendAddRecordTransactional(1, 1, (byte)1, new SimpleEncoding(1, (byte)1));
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -409,7 +409,7 @@
log.warn(e);
}
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -420,7 +420,7 @@
{
final int JOURNAL_SIZE = 1100;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
journalImpl.setAutoReclaim(false);
@@ -441,7 +441,7 @@
assertEquals(12, factory.listFiles("tt").size());
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -458,7 +458,7 @@
log.debug("Expected exception " + e, e);
}
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -471,7 +471,7 @@
{
final int JOURNAL_SIZE = 2000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -488,7 +488,7 @@
assertEquals(12, factory.listFiles("tt").size());
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(10, records.size());
assertEquals(0, transactions.size());
@@ -517,7 +517,7 @@
assertEquals(1, journalImpl.getDataFilesCount());
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(1, journalImpl.getDataFilesCount());
@@ -528,7 +528,7 @@
{
final int JOURNAL_SIZE = 2000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -542,7 +542,7 @@
journalImpl.debugWait();
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(1, records.size());
@@ -552,22 +552,21 @@
{
final int JOURNAL_SIZE = 2000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(2, factory.listFiles("tt").size());
assertEquals(0, records.size());
assertEquals(0, transactions.size());
- for (int i = 0; i < 20; i++)
+ for (int i = 0; i < 2; i++)
{
journalImpl.appendAddRecordTransactional(1l, i, (byte)0, new SimpleEncoding(1, (byte)15));
- journalImpl.forceMoveNextFile();
}
- journalImpl.forceMoveNextFile();
-
journalImpl.appendCommitRecord(1l, false);
+
+ System.out.println("Files = " + factory.listFiles("tt"));
SequentialFile file = factory.createSequentialFile("tt-1.tt", 1);
@@ -601,7 +600,7 @@
file.close();
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
@@ -615,9 +614,9 @@
public void testPartiallyBrokenFile() throws Exception
{
- final int JOURNAL_SIZE = 2000;
+ final int JOURNAL_SIZE = 20000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(2, factory.listFiles("tt").size());
@@ -628,11 +627,8 @@
{
journalImpl.appendAddRecordTransactional(1l, i, (byte)0, new SimpleEncoding(1, (byte)15));
journalImpl.appendAddRecordTransactional(2l, i + 20l, (byte)0, new SimpleEncoding(1, (byte)15));
- journalImpl.forceMoveNextFile();
}
- journalImpl.forceMoveNextFile();
-
journalImpl.appendCommitRecord(1l, false);
journalImpl.appendCommitRecord(2l, false);
@@ -669,27 +665,24 @@
file.close();
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(20, records.size());
journalImpl.checkAndReclaimFiles();
- assertEquals(20, journalImpl.getDataFilesCount());
- assertEquals(22, factory.listFiles("tt").size());
-
}
public void testReduceFreeFiles() throws Exception
{
final int JOURNAL_SIZE = 2000;
- setupJournal(JOURNAL_SIZE, 100, 10);
+ setupAndLoadJournal(JOURNAL_SIZE, 100, 10);
assertEquals(10, factory.listFiles("tt").size());
- setupJournal(JOURNAL_SIZE, 100, 2);
+ setupAndLoadJournal(JOURNAL_SIZE, 100, 2);
assertEquals(10, factory.listFiles("tt").size());
@@ -699,7 +692,7 @@
journalImpl.forceMoveNextFile();
}
- setupJournal(JOURNAL_SIZE, 100, 2);
+ setupAndLoadJournal(JOURNAL_SIZE, 100, 2);
assertEquals(10, records.size());
@@ -714,7 +707,7 @@
journalImpl.checkAndReclaimFiles();
- setupJournal(JOURNAL_SIZE, 100, 2);
+ setupAndLoadJournal(JOURNAL_SIZE, 100, 2);
assertEquals(0, records.size());
@@ -725,7 +718,7 @@
{
final int JOURNAL_SIZE = 2000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(2, factory.listFiles("tt").size());
@@ -735,17 +728,13 @@
for (int i = 0; i < 10; i++)
{
journalImpl.appendAddRecordTransactional(1l, i, (byte)0, new SimpleEncoding(1, (byte)15));
- journalImpl.forceMoveNextFile();
}
for (int i = 10; i < 20; i++)
{
journalImpl.appendAddRecordTransactional(1l, i, (byte)0, new SimpleEncoding(1, (byte)15));
- journalImpl.forceMoveNextFile();
}
- journalImpl.forceMoveNextFile();
-
journalImpl.appendCommitRecord(1l, false);
SequentialFile file = factory.createSequentialFile("tt-1.tt", 1);
@@ -773,7 +762,7 @@
file.close();
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
@@ -789,7 +778,7 @@
{
final int JOURNAL_SIZE = 20000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -821,7 +810,7 @@
journalImpl.forceMoveNextFile();
journalImpl.checkAndReclaimFiles();
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(1, records.size());
}
@@ -830,7 +819,7 @@
{
final int JOURNAL_SIZE = 20000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -859,7 +848,7 @@
journalImpl.forceMoveNextFile();
journalImpl.checkAndReclaimFiles();
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(40, records.size());
@@ -869,7 +858,7 @@
{
final int JOURNAL_SIZE = 3 * 1024;
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -884,7 +873,7 @@
journalImpl.debugWait();
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(1, transactions.size());
assertEquals(1, transactions.get(0).recordsToDelete.size());
@@ -911,7 +900,7 @@
journalImpl.debugWait();
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(0, transactions.size());
assertEquals(0, records.size());
@@ -922,7 +911,7 @@
{
final int JOURNAL_SIZE = 3 * 1024;
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -941,7 +930,7 @@
assertEquals(12, factory.listFiles("tt").size());
- setupJournal(JOURNAL_SIZE, 1024);
+ setupAndLoadJournal(JOURNAL_SIZE, 1024);
assertEquals(0, records.size());
assertEquals(1, transactions.size());
@@ -960,7 +949,7 @@
journalImpl.appendCommitRecord(1l, false);
- setupJournal(JOURNAL_SIZE, 1024);
+ setupAndLoadJournal(JOURNAL_SIZE, 1024);
assertEquals(10, records.size());
@@ -975,7 +964,7 @@
journalImpl.appendPrepareRecord(2l, xid2, false);
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(1, transactions.size());
@@ -992,7 +981,7 @@
journalImpl.appendCommitRecord(2l, false);
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -1011,7 +1000,7 @@
{
final int JOURNAL_SIZE = 3000;
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -1019,12 +1008,11 @@
for (int i = 0; i < 10; i++)
{
journalImpl.appendAddRecordTransactional(1, i, (byte)1, new SimpleEncoding(50, (byte)1));
- journalImpl.forceMoveNextFile();
}
journalImpl.appendPrepareRecord(1l, new SimpleEncoding(13, (byte)0), false);
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(1, transactions.size());
@@ -1053,7 +1041,7 @@
file.close();
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -1063,7 +1051,7 @@
{
final int JOURNAL_SIZE = 2000;
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
for (int i = 0; i < 10; i++)
{
@@ -1079,7 +1067,7 @@
assertEquals(0, journalImpl.getDataFilesCount());
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(0, journalImpl.getDataFilesCount());
@@ -1092,7 +1080,7 @@
{
final int JOURNAL_SIZE = 512 * 4;
- setupJournal(JOURNAL_SIZE, 512);
+ setupAndLoadJournal(JOURNAL_SIZE, 512);
for (int i = 0; i < 10; i++)
{
@@ -1101,11 +1089,11 @@
journalImpl.appendCommitRecord(1l, false);
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(10, records.size());
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(10, records.size());
}
@@ -1115,7 +1103,7 @@
{
final int JOURNAL_SIZE = 512 * 4;
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
for (int i = 0; i < 10; i++)
{
@@ -1124,11 +1112,11 @@
journalImpl.appendCommitRecord(1l, false);
- setupJournal(JOURNAL_SIZE, 100);
+ setupAndLoadJournal(JOURNAL_SIZE, 100);
assertEquals(10, records.size());
- setupJournal(JOURNAL_SIZE, 512);
+ setupAndLoadJournal(JOURNAL_SIZE, 512);
assertEquals(10, records.size());
}
@@ -1137,7 +1125,7 @@
{
final int JOURNAL_SIZE = 512 * 4;
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
journalImpl.appendPrepareRecord(2l, new SimpleEncoding(10, (byte)'j'), false);
@@ -1145,7 +1133,7 @@
journalImpl.appendAddRecord(1l, (byte)0, new SimpleEncoding(10, (byte)'k'), false);
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(1, journalImpl.getDataFilesCount());
@@ -1153,7 +1141,7 @@
journalImpl.forceMoveNextFile();
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(1, journalImpl.getDataFilesCount());
@@ -1165,7 +1153,7 @@
journalImpl.forceMoveNextFile();
- setupJournal(JOURNAL_SIZE, 0);
+ setupAndLoadJournal(JOURNAL_SIZE, 0);
journalImpl.forceMoveNextFile();
journalImpl.debugWait();
@@ -1180,7 +1168,7 @@
{
final int JOURNAL_SIZE = 10 * 1024;
- setupJournal(JOURNAL_SIZE, 1);
+ setupAndLoadJournal(JOURNAL_SIZE, 1);
assertEquals(0, records.size());
assertEquals(0, transactions.size());
@@ -1347,12 +1335,12 @@
// Private -------------------------------------------------------
- private void setupJournal(final int journalSize, final int alignment) throws Exception
+ private void setupAndLoadJournal(final int journalSize, final int alignment) throws Exception
{
- setupJournal(journalSize, alignment, 2);
+ setupAndLoadJournal(journalSize, alignment, 2);
}
- private void setupJournal(final int journalSize, final int alignment, final int numberOfMinimalFiles) throws Exception
+ private void setupAndLoadJournal(final int journalSize, final int alignment, final int numberOfMinimalFiles) throws Exception
{
if (factory == null)
{
More information about the jboss-cvs-commits
mailing list