Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[4570] branches/QUADS_QUERY_BRANCH/bigdata/src/test/com /bigdata
|
From: <tho...@us...> - 2011-05-28 20:31:22
|
Revision: 4570
http://bigdata.svn.sourceforge.net/bigdata/?rev=4570&view=rev
Author: thompsonbry
Date: 2011-05-28 20:31:16 +0000 (Sat, 28 May 2011)
Log Message:
-----------
A little more CI cleanup. I've moved the TestHelper invocation (to look for leaked journals or buffers) up to AbstractIndexManagerTestCase.
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractIndexManagerTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractJournalTestCase.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestPrefixSearch.java
branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/sparse/TestSparseRowStore.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractIndexManagerTestCase.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractIndexManagerTestCase.java 2011-05-28 20:16:58 UTC (rev 4569)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractIndexManagerTestCase.java 2011-05-28 20:31:16 UTC (rev 4570)
@@ -43,9 +43,9 @@
*/
public abstract class AbstractIndexManagerTestCase<S extends IIndexManager> extends TestCase3 {
- protected final static boolean INFO = log.isInfoEnabled();
+ private final static boolean INFO = log.isInfoEnabled();
- protected final static boolean DEBUG = log.isDebugEnabled();
+ private final static boolean DEBUG = log.isDebugEnabled();
//
// Constructors.
@@ -78,7 +78,9 @@
if(INFO)
log.info("\n================:END:" + testCase.getName()
+ ":END:====================\n");
-
+
+ TestHelper.checkJournalsClosed(testCase, this);
+
}
public void tearDown() throws Exception {
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractJournalTestCase.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractJournalTestCase.java 2011-05-28 20:16:58 UTC (rev 4569)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractJournalTestCase.java 2011-05-28 20:31:16 UTC (rev 4570)
@@ -85,7 +85,8 @@
super.tearDown(testCase);
- TestHelper.checkJournalsClosed(testCase, this);
+ // Note: moved into the parent class.
+// TestHelper.checkJournalsClosed(testCase, this);
// deleteTestFile();
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestPrefixSearch.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestPrefixSearch.java 2011-05-28 20:16:58 UTC (rev 4569)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/search/TestPrefixSearch.java 2011-05-28 20:31:16 UTC (rev 4570)
@@ -104,8 +104,9 @@
final Hiterator itr = ndx.search("The quick brown dog",
languageCode, false/* prefixMatch */);
- if(INFO) log.info("hits:" + itr);
-
+ if (log.isInfoEnabled())
+ log.info("hits:" + itr);
+
assertEquals(2, itr.size());
assertTrue(itr.hasNext());
@@ -131,7 +132,7 @@
final Hiterator itr = ndx.search("The qui bro do",
languageCode, true/*prefixMatch*/);
- if(INFO) log.info("hits:" + itr);
+ if(log.isInfoEnabled()) log.info("hits:" + itr);
assertEquals(2, itr.size());
@@ -158,7 +159,7 @@
final Hiterator itr = ndx
.search("brown", languageCode, false/* prefixMatch */);
- if (INFO)
+ if(log.isInfoEnabled())
log.info("hits:" + itr);
assertEquals(2, itr.size());
@@ -173,7 +174,7 @@
final Hiterator itr = ndx
.search("brown", languageCode, true/* prefixMatch */);
- if(INFO) log.info("hits:" + itr);
+ if(log.isInfoEnabled()) log.info("hits:" + itr);
assertEquals(2, itr.size());
@@ -187,7 +188,7 @@
final Hiterator itr = ndx
.search("bro", languageCode, true/* prefixMatch */);
- if(INFO) log.info("hits:" + itr);
+ if(log.isInfoEnabled()) log.info("hits:" + itr);
assertEquals(2, itr.size());
@@ -201,7 +202,7 @@
final Hiterator itr = ndx
.search("bro", languageCode, false/* prefixMatch */);
- if (INFO)
+ if(log.isInfoEnabled())
log.info("hits:" + itr);
assertEquals(0, itr.size());
@@ -216,7 +217,7 @@
final Hiterator itr = ndx
.search("qui", languageCode, true/* prefixMatch */);
- if (INFO)
+ if(log.isInfoEnabled())
log.info("hits:" + itr);
assertEquals(1, itr.size());
@@ -231,7 +232,7 @@
final Hiterator itr = ndx
.search("qui", languageCode, false/* prefixMatch */);
- if (INFO)
+ if (log.isInfoEnabled())
log.info("hits:" + itr);
assertEquals(0, itr.size());
@@ -246,7 +247,7 @@
final Hiterator itr = ndx
.search("quick", languageCode, false/* prefixMatch */);
- if (INFO)
+ if (log.isInfoEnabled())
log.info("hits:" + itr);
assertEquals(1, itr.size());
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/sparse/TestSparseRowStore.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/sparse/TestSparseRowStore.java 2011-05-28 20:16:58 UTC (rev 4569)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/sparse/TestSparseRowStore.java 2011-05-28 20:31:16 UTC (rev 4570)
@@ -98,7 +98,7 @@
if (ndx == null) {
- if (INFO)
+ if(log.isInfoEnabled())
log.info("Registering index: " + name);
/*
@@ -268,7 +268,7 @@
final KeyDecoder keyDecoder = new KeyDecoder(key);
- if(INFO)
+ if(log.isInfoEnabled())
log.info(keyDecoder.getColumnName() + "="
+ ValueType.decode(val) + " (" + keyDecoder.timestamp
+ ")");
@@ -316,7 +316,7 @@
} finally {
- try {store.destroy();} catch(Throwable t) {log.error(t);}
+ store.destroy();
}
@@ -339,11 +339,7 @@
} finally {
- try {
- store.destroy();
- } catch (Throwable t) {
- log.error(t);
- }
+ store.destroy();
}
@@ -612,12 +608,8 @@
} finally {
- try {
- store.destroy();
- } catch (Throwable t) {
- log.error(t);
- }
-
+ store.destroy();
+
}
}
@@ -758,11 +750,7 @@
} finally {
- try {
- store.destroy();
- } catch (Throwable t) {
- log.error(t);
- }
+ store.destroy();
}
@@ -869,7 +857,7 @@
} finally {
- try {store.destroy();} catch(Throwable t) {log.error(t);}
+ store.destroy();
}
@@ -1164,7 +1152,7 @@
} finally {
- try {store.destroy();} catch(Throwable t) {log.error(t);}
+ store.destroy();
}
@@ -1249,7 +1237,7 @@
} finally {
- try {store.destroy();} catch(Throwable t) {log.error(t);}
+ store.destroy();
}
@@ -1364,11 +1352,7 @@
} finally {
- try {
- store.destroy();
- } catch (Throwable t) {
- log.error(t);
- }
+ store.destroy();
}
@@ -1483,12 +1467,8 @@
} finally {
- try {
- store.destroy();
- } catch (Throwable t) {
- log.error(t);
- }
-
+ store.destroy();
+
}
}
@@ -1496,21 +1476,22 @@
/**
* Verify that two rows have the same column values.
*/
- protected void assertSameValues(Map<String,Object> expected, Map<String,Object> actual) {
-
+ protected void assertSameValues(final Map<String, Object> expected,
+ final Map<String, Object> actual) {
+
assertEquals("#of values", expected.size(), actual.size() );
- Iterator<String> itr = expected.keySet().iterator();
+ final Iterator<String> itr = expected.keySet().iterator();
while(itr.hasNext()) {
- String col = itr.next();
+ final String col = itr.next();
assertTrue("No value: col=" + col, actual.containsKey(col));
- Object expectedValue = expected.get(col);
+ final Object expectedValue = expected.get(col);
- Object actualValue = actual.get(col);
+ final Object actualValue = actual.get(col);
assertNotNull(col+" is null.", actualValue);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
