Add and use TestBase.assertNotNull()

h2/src/test/org/h2/test/TestBase.java

@@ -974,6 +974,31 @@ public abstract class TestBase {
         }
     }
 
+    /**
+     * Check that the passed object is not null.
+     *
+     * @param obj the object
+     * @throws AssertionError if the condition is false
+     */
+    public void assertNotNull(Object obj) {
+        if (obj == null) {
+            fail("Expected: not null got: null");
+        }
+    }
+
+    /**
+     * Check that the passed object is not null.
+     *
+     * @param message the message to print if the condition is false
+     * @param obj the object
+     * @throws AssertionError if the condition is false
+     */
+    public void assertNotNull(String message, Object obj) {
+        if (obj == null) {
+            fail(message);
+        }
+    }
+
     /**
      * Check that the passed boolean is true.
      *

h2/src/test/org/h2/test/db/AbstractBaseForCommonTableExpressions.java

@@ -57,7 +57,7 @@ public abstract class AbstractBaseForCommonTableExpressions extends TestBase {
             rs = prep.executeQuery();
             for (int columnIndex = 1; columnIndex <= rs.getMetaData().getColumnCount(); columnIndex++) {
 
-                assertTrue(rs.getMetaData().getColumnLabel(columnIndex) != null);
+                assertNotNull(rs.getMetaData().getColumnLabel(columnIndex));
                 assertEquals(expectedColumnNames[columnIndex - 1], rs.getMetaData().getColumnLabel(columnIndex));
                 assertEquals(
                         "wrong type of column " + rs.getMetaData().getColumnLabel(columnIndex) + " on iteration #"

h2/src/test/org/h2/test/db/TestDeadlock.java

@@ -390,7 +390,7 @@ public class TestDeadlock extends TestBase {
     }
 
     private void checkDeadlock() throws SQLException {
-        assertTrue(lastException != null);
+        assertNotNull(lastException);
         assertKnownException(lastException);
         assertEquals(ErrorCode.DEADLOCK_1, lastException.getErrorCode());
         SQLException e2 = lastException.getNextException();

h2/src/test/org/h2/test/db/TestFunctions.java

@@ -520,7 +520,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         stat.execute("delete from test");
         rs = stat.executeQuery("call transaction_id()");
         rs.next();
-        assertTrue(rs.getString(1) != null);
+        assertNotNull(rs.getString(1));
         stat.execute("drop table test");
         conn.close();
     }

h2/src/test/org/h2/test/db/TestRunscript.java

@@ -350,7 +350,7 @@ public class TestRunscript extends TestBase implements Trigger {
         Thread.sleep(200);
         stat.cancel();
         SQLException e = (SQLException) task.getException();
-        assertTrue(e != null);
+        assertNotNull(e);
         assertEquals(ErrorCode.STATEMENT_WAS_CANCELED, e.getErrorCode());
 
         stat.execute("set throttle 1000");
@@ -367,7 +367,7 @@ public class TestRunscript extends TestBase implements Trigger {
         Thread.sleep(200);
         stat.cancel();
         e = (SQLException) task.getException();
-        assertTrue(e != null);
+        assertNotNull(e);
         assertEquals(ErrorCode.STATEMENT_WAS_CANCELED, e.getErrorCode());
 
         conn.close();

h2/src/test/org/h2/test/db/TestSpatial.java

@@ -914,7 +914,7 @@ public class TestSpatial extends TestBase {
             count++;
             int id = rs.getInt(1);
             if (id == 3 || id == 6) {
-                assertTrue(rs.getObject(2) != null);
+                assertNotNull(rs.getObject(2));
             } else {
                 assertNull(rs.getObject(2));
             }
@@ -933,7 +933,7 @@ public class TestSpatial extends TestBase {
         count = 0;
         while (rs.next()) {
             count++;
-            assertTrue(rs.getObject(2) != null);
+            assertNotNull(rs.getObject(2));
         }
         assertEquals(2, count);
 

h2/src/test/org/h2/test/db/TestSynonymForTable.java

@@ -184,7 +184,7 @@ public class TestSynonymForTable extends TestBase {
         assertEquals("BACKINGTABLE", synonyms.getString("SYNONYM_FOR"));
         assertEquals("VALID", synonyms.getString("STATUS"));
         assertEquals("", synonyms.getString("REMARKS"));
-        assertTrue(synonyms.getString("ID") != null);
+        assertNotNull(synonyms.getString("ID"));
         assertFalse(synonyms.next());
         conn.close();
     }

h2/src/test/org/h2/test/db/TestTableEngines.java

@@ -507,7 +507,7 @@ public class TestTableEngines extends TestBase {
         stat.executeUpdate("CREATE TABLE T(ID INT AFFINITY PRIMARY KEY, NAME VARCHAR, AGE INT)" +
                 " ENGINE \"" + AffinityTableEngine.class.getName() + "\"");
         Table tbl = AffinityTableEngine.createdTbl;
-        assertTrue(tbl != null);
+        assertNotNull(tbl);
         assertEquals(3, tbl.getIndexes().size());
         Index aff = tbl.getIndexes().get(2);
         assertTrue(aff.getIndexType().isAffinity());

h2/src/test/org/h2/test/jaqu/UpdateTest.java

@@ -75,7 +75,7 @@ public class UpdateTest extends TestBase {
 
         Order ourUpdatedOrder = db.from(o).where(o.orderDate)
                 .is(valueOf("2007-01-03")).selectFirst();
-        assertTrue("updated order not found", ourUpdatedOrder != null);
+        assertNotNull("updated order not found", ourUpdatedOrder);
 
         // undo update
         ourOrder.orderDate = valueOf("2007-01-02");
@@ -113,7 +113,7 @@ public class UpdateTest extends TestBase {
 
         Order ourUpdatedOrder = db.from(o).where(o.orderDate)
                 .is(valueOf("2007-01-03")).selectFirst();
-        assertTrue("updated order not found", ourUpdatedOrder != null);
+        assertNotNull("updated order not found", ourUpdatedOrder);
 
         // undo update
         ourOrder.orderDate = valueOf("2007-01-02");

h2/src/test/org/h2/test/jdbc/TestBatchUpdates.java

@@ -79,10 +79,10 @@ public class TestBatchUpdates extends TestBase {
         } catch (SQLException e) {
             assertContains(e.toString(), "TEST_Y");
             e = e.getNextException();
-            assertTrue(e != null);
+            assertNotNull(e);
             assertContains(e.toString(), "TEST_Y");
             e = e.getNextException();
-            assertTrue(e != null);
+            assertNotNull(e);
             assertContains(e.toString(), "TEST_X");
             e = e.getNextException();
             assertNull(e);
@@ -98,10 +98,10 @@ public class TestBatchUpdates extends TestBase {
         } catch (SQLException e) {
             assertContains(e.toString(), "TEST_Y");
             e = e.getNextException();
-            assertTrue(e != null);
+            assertNotNull(e);
             assertContains(e.toString(), "TEST_Y");
             e = e.getNextException();
-            assertTrue(e != null);
+            assertNotNull(e);
             assertContains(e.toString(), "TEST_X");
             e = e.getNextException();
             assertNull(e);

h2/src/test/org/h2/test/jdbc/TestGetGeneratedKeys.java

@@ -130,19 +130,19 @@ public class TestGetGeneratedKeys extends TestBase {
         rs.next();
         assertEquals(1L, rs.getLong(1));
         UUID u1 = (UUID) rs.getObject(2);
-        assertTrue(u1 != null);
+        assertNotNull(u1);
         rs.next();
         assertEquals(2L, rs.getLong(1));
         UUID u2 = (UUID) rs.getObject(2);
-        assertTrue(u2 != null);
+        assertNotNull(u2);
         rs.next();
         assertEquals(3L, rs.getLong(1));
         UUID u3 = (UUID) rs.getObject(2);
-        assertTrue(u3 != null);
+        assertNotNull(u3);
         rs.next();
         assertEquals(4L, rs.getLong(1));
         UUID u4 = (UUID) rs.getObject(2);
-        assertTrue(u4 != null);
+        assertNotNull(u4);
         assertFalse(rs.next());
         assertFalse(u1.equals(u2));
         assertFalse(u2.equals(u3));

h2/src/test/org/h2/test/jdbc/TestMetaData.java

@@ -127,7 +127,7 @@ public class TestMetaData extends TestBase {
         rs = stat.executeQuery("select 1 from dual");
         rs.next();
         rsMeta = rs.getMetaData();
-        assertTrue(rsMeta.getCatalogName(1) != null);
+        assertNotNull(rsMeta.getCatalogName(1));
         assertEquals("1", rsMeta.getColumnLabel(1));
         assertEquals("1", rsMeta.getColumnName(1));
         assertEquals("", rsMeta.getSchemaName(1));

h2/src/test/org/h2/test/jdbc/TestPreparedStatement.java

@@ -404,7 +404,7 @@ public class TestPreparedStatement extends TestBase {
         Thread.sleep(100);
         prep.cancel();
         SQLException e = (SQLException) t.getException();
-        assertTrue(e != null);
+        assertNotNull(e);
         assertEquals(ErrorCode.STATEMENT_WAS_CANCELED, e.getErrorCode());
         prep.setInt(1, 1);
         prep.setInt(2, 1);

h2/src/test/org/h2/test/jdbc/TestResultSet.java

@@ -1597,7 +1597,7 @@ public class TestResultSet extends TestBase {
         assertEqualsWithNull(new byte[] { (byte) 0x0b, (byte) 0xce, (byte) 0xc1 }, b);
         Blob blob = rs.getObject("value", Blob.class);
         try {
-            assertTrue(blob != null);
+            assertNotNull(blob);
             assertEqualsWithNull(new byte[] { (byte) 0x0b, (byte) 0xce, (byte) 0xc1 },
                     readAllBytes(blob.getBinaryStream()));
             assertEqualsWithNull(new byte[] { (byte) 0xce,
@@ -1611,7 +1611,7 @@ public class TestResultSet extends TestBase {
 
         blob = rs.getObject("value", Blob.class);
         try {
-            assertTrue(blob != null);
+            assertNotNull(blob);
             assertEqualsWithNull(new byte[] { (byte) 0x03, (byte) 0x03,
                     (byte) 0x03, (byte) 0x03 }, readAllBytes(blob.getBinaryStream()));
             assertEqualsWithNull(new byte[] { (byte) 0x03,
@@ -1629,7 +1629,7 @@ public class TestResultSet extends TestBase {
 
         blob = rs.getObject("value", Blob.class);
         try {
-            assertTrue(blob != null);
+            assertNotNull(blob);
             assertEqualsWithNull(random, readAllBytes(blob.getBinaryStream()));
             byte[] expected = Arrays.copyOfRange(random, 100, 50102);
             byte[] got = readAllBytes(blob.getBinaryStream(101, 50002));
@@ -1715,7 +1715,7 @@ public class TestResultSet extends TestBase {
 
         clob = rs.getObject("value", Clob.class);
         try {
-            assertTrue(clob != null);
+            assertNotNull(clob);
             string = readString(clob.getCharacterStream());
             assertTrue(string != null && string.equals("Test2"));
             assertFalse(rs.wasNull());

h2/src/test/org/h2/test/recover/RecoverLobTest.java

@@ -69,7 +69,7 @@ public class RecoverLobTest extends TestBase {
             int id = rs.getInt(1);
             String data = rs.getString(2);
 
-            assertTrue(data != null);
+            assertNotNull(data);
             assertTrue(data.length() == 10000 * id);
 
         }

h2/src/test/org/h2/test/store/TestCacheLIRS.java

@@ -449,8 +449,8 @@ public class TestCacheLIRS extends TestBase {
             Integer x = test.get(i);
             Integer y = test.peek(i);
             if (i < size / 2) {
-                assertTrue("i: " + i, x != null);
-                assertTrue("i: " + i, y != null);
+                assertNotNull("i: " + i, x);
+                assertNotNull("i: " + i, y);
                 assertEquals(i * 10, x.intValue());
                 assertEquals(i * 10, y.intValue());
             } else {
@@ -469,7 +469,7 @@ public class TestCacheLIRS extends TestBase {
         for (int i = 0; i < size; i++) {
             Integer x = test.get(i);
             if (i < size / 2 || i == size - 1) {
-                assertTrue("i: " + i, x != null);
+                assertNotNull("i: " + i, x);
                 assertEquals(i * 10, x.intValue());
             } else {
                 assertNull(x);

h2/src/test/org/h2/test/store/TestCacheLongKeyLIRS.java

@@ -378,8 +378,8 @@ public class TestCacheLongKeyLIRS extends TestBase {
             Integer x = test.get(i);
             Integer y = test.peek(i);
             if (i < size / 2) {
-                assertTrue("i: " + i, x != null);
-                assertTrue("i: " + i, y != null);
+                assertNotNull("i: " + i, x);
+                assertNotNull("i: " + i, y);
                 assertEquals(i * 10, x.intValue());
                 assertEquals(i * 10, y.intValue());
             } else {
@@ -398,7 +398,7 @@ public class TestCacheLongKeyLIRS extends TestBase {
         for (int i = 0; i < size; i++) {
             Integer x = test.get(i);
             if (i < size / 2 || i == size - 1 || i == size - 2) {
-                assertTrue("i: " + i, x != null);
+                assertNotNull("i: " + i, x);
                 assertEquals(i * 10, x.intValue());
             } else {
                 assertNull(x);

h2/src/test/org/h2/test/store/TestDataUtils.java

@@ -141,7 +141,7 @@ public class TestDataUtils extends TestBase {
             }
             try {
                 HashMap<String, String> map = DataUtils.parseMap(buff.toString());
-                assertFalse(map == null);
+                assertNotNull(map);
                 // ok
             } catch (IllegalStateException e) {
                 // ok - but not another exception

h2/src/test/org/h2/test/store/TestMVRTree.java

@@ -134,7 +134,7 @@ public class TestMVRTree extends TestMVStore {
         for (SpatialKey k; it.hasNext();) {
             k = it.next();
             // System.out.println(k + ": " + r.get(k));
-            assertTrue(k != null);
+            assertNotNull(k);
         }
         s.close();
     }
@@ -181,7 +181,7 @@ public class TestMVRTree extends TestMVStore {
         assertEquals(len, r.size());
         int count = 0;
         for (SpatialKey k : r.keySet()) {
-            assertTrue(r.get(k) != null);
+            assertNotNull(r.get(k));
             count++;
         }
         assertEquals(len, count);
@@ -413,7 +413,7 @@ public class TestMVRTree extends TestMVStore {
                 while (it.hasNext()) {
                     SpatialKey n = it.next();
                     String a = map.get(n);
-                    assertFalse(a == null);
+                    assertNotNull(a);
                 }
                 break;
             }
@@ -424,7 +424,7 @@ public class TestMVRTree extends TestMVStore {
                 while (it.hasNext()) {
                     SpatialKey n = it.next();
                     String a = map.get(n);
-                    assertFalse(a == null);
+                    assertNotNull(a);
                 }
                 break;
             }

h2/src/test/org/h2/test/store/TestMVStore.java

@@ -528,7 +528,7 @@ public class TestMVStore extends TestBase {
                 sleep(10);
             }
             Throwable e = exRef.get();
-            assertTrue(e != null);
+            assertNotNull(e);
             assertEquals(DataUtils.ERROR_WRITING_FAILED,
                     DataUtils.getErrorCode(e.getMessage()));
         } catch (IllegalStateException e) {
@@ -894,7 +894,7 @@ public class TestMVStore extends TestBase {
         s.close();
         s = openStore(fileName);
         Object test = s.getStoreHeader().get("test");
-        assertFalse(test == null);
+        assertNotNull(test);
         assertEquals("123", test.toString());
         s.close();
     }
@@ -1506,8 +1506,8 @@ public class TestMVStore extends TestBase {
         s.setRetentionTime(45000);
         assertEquals(2, s.getCurrentVersion());
         meta = s.getMetaMap();
-        assertTrue(meta.get("name.data") != null);
-        assertTrue(meta.get("name.data0") != null);
+        assertNotNull(meta.get("name.data"));
+        assertNotNull(meta.get("name.data0"));
         assertNull(meta.get("name.data1"));
         m = s.openMap("data");
         m0 = s.openMap("data0");

h2/src/test/org/h2/test/store/TestMVStoreBenchmark.java

@@ -174,7 +174,7 @@ public class TestMVStoreBenchmark extends TestBase {
                 for (int a = 0; a < 5; a++) {
                     for (int i = 0; i < size; i++) {
                         String x = map.get(i);
-                        assertTrue(x != null);
+                        assertNotNull(x);
                     }
                 }
                 for (int i = 0; i < size; i++) {

h2/src/test/org/h2/test/store/TestMVTableEngine.java

@@ -180,7 +180,7 @@ public class TestMVTableEngine extends TestBase {
         stat.execute("checkpoint");
         stat.execute("shutdown immediately");
         Exception ex = t.getException();
-        assertTrue(ex != null);
+        assertNotNull(ex);
         try {
             conn.close();
         } catch (Exception e) {

h2/src/test/org/h2/test/store/TestTransactionStore.java

@@ -860,7 +860,7 @@ public class TestTransactionStore extends TestBase {
                             assertNull(map.get(x));
                         }
                     } catch (SQLException e) {
-                        assertTrue(map.get(x) != null);
+                        assertNotNull(map.get(x));
                         assertFalse(map.tryRemove(x));
                         // PostgreSQL needs to rollback
                         buff.append(" -> rollback");

h2/src/test/org/h2/test/unit/TestFileSystem.java

@@ -219,16 +219,16 @@ public class TestFileSystem extends TestBase {
         String resource = "org/h2/test/scripts/testSimple.in.txt";
         InputStream in;
         in = getClass().getResourceAsStream("/" + resource);
-        assertTrue(in != null);
+        assertNotNull(in);
         in.close();
         in = getClass().getClassLoader().getResourceAsStream(resource);
-        assertTrue(in != null);
+        assertNotNull(in);
         in.close();
         in = FileUtils.newInputStream("classpath:" + resource);
-        assertTrue(in != null);
+        assertNotNull(in);
         in.close();
         in = FileUtils.newInputStream("classpath:/" + resource);
-        assertTrue(in != null);
+        assertNotNull(in);
         in.close();
     }
 

h2/src/test/org/h2/test/unit/TestNetUtils.java

@@ -125,7 +125,7 @@ public class TestNetUtils extends TestBase {
             closeSilently(socket);
             closeSilently(serverSocket);
             if (task != null) {
-                assertTrue(task.getException() != null);
+                assertNotNull(task.getException());
                 assertEquals(javax.net.ssl.SSLHandshakeException.class.getName(),
                         task.getException().getClass().getName());
                 assertContains(task.getException().getMessage(), "certificate_unknown");

h2/src/test/org/h2/test/utils/TestColumnNamer.java

@@ -47,7 +47,7 @@ public class TestColumnNamer extends TestBase {
         for (String id : ids) {
             Expression columnExp = ValueExpression.getDefault();
             String newColumnName = columnNamer.getColumnName(columnExp, index + 1, id);
-            assertTrue(newColumnName != null);
+            assertNotNull(newColumnName);
             assertTrue(newColumnName.length() <= 30);
             assertTrue(newColumnName.length() >= 1);
             assertEquals(newColumnName, expectedColumnName[index]);