Add Bool SimpleTest

Author: ax3l

src/include/splash/basetypes/ColTypeBool.hpp

@@ -36,6 +36,10 @@ class ColTypeBool : public CollectionType
     ColTypeBool()
     {
         this->type = H5Tenum_create(H5T_NATIVE_INT8);
+        const char *names[2] = {"true", "false"};
+        int64_t val[2] = {1, 0};
+        H5Tenum_insert(this->type, names[0], &val[0]);
+        H5Tenum_insert(this->type, names[1], &val[1]);
     }
 
     ~ColTypeBool()

tests/SimpleDataTest.cpp

@@ -40,7 +40,8 @@ using namespace splash;
 
 SimpleDataTest::SimpleDataTest() :
 ctUInt32(),
-ctUInt64()
+ctUInt64(),
+ctBool()
 {
     dataCollector = new SerialDataCollector(10);
     srand(time(NULL));
@@ -74,9 +75,13 @@ bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize
     // initial part of the test: data is written to the file, once with and once
     // without borders
     uint64_t *dataWrite = new uint64_t[bufferSize];
+    bool     *boolWrite = new bool[bufferSize];
 
     for (uint64_t i = 0; i < bufferSize; i++)
+    {
         dataWrite[i] = i;
+        boolWrite[i] = ( i%2 == 0 );
+    }
 
     dataCollector->write(10, ctUInt64, dimensions, Selection(gridSize), "deep/folders/data", dataWrite);
     datasetNames.insert("deep/folders/data");
@@ -85,6 +90,13 @@ bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize
             borderSize), "deep/folders/data_without_borders", dataWrite);
     datasetNames.insert("deep/folders/data_without_borders");
 
+    dataCollector->write(10, ctBool, dimensions, Selection(gridSize), "deep/folders/data_bool", boolWrite);
+    datasetNames.insert("deep/folders/data_bool");
+
+    dataCollector->write(20, ctBool, dimensions, Selection(gridSize, smallGridSize,
+            borderSize), "deep/folders/data_bool_without_borders", boolWrite);
+    datasetNames.insert("deep/folders/data_bool_without_borders");
+
     dataCollector->close();
 
     // first part of the test: read data with borders to a cleared
@@ -103,14 +115,16 @@ bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize
     int32_t *ids = NULL;
     size_t numIDs = 0;
     dataCollector->getEntryIDs(NULL, &numIDs);
+    printf("number of entry IDs=%d\n", numIDs);
     CPPUNIT_ASSERT(numIDs == 2);
     ids = new int32_t[numIDs];
     dataCollector->getEntryIDs(ids, NULL);
 
     for (uint32_t j = 0; j < numIDs; ++j)
     {
         dataCollector->getEntriesForID(ids[j], NULL, &numEntries);
-        CPPUNIT_ASSERT(numEntries == 1);
+        printf("numEntries=%d\n", numEntries);
+        CPPUNIT_ASSERT(numEntries == 2);
         entries = new DataCollector::DCEntry[numEntries];
         dataCollector->getEntriesForID(ids[j], entries, NULL);
 
@@ -129,6 +143,7 @@ bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize
     delete[] ids;
 
     uint64_t *dataRead = new uint64_t[bufferSize];
+    bool *boolRead = NULL;
     for (uint64_t i = 0; i < bufferSize; i++)
         dataRead[i] = UINT64_MAX;
 
@@ -157,8 +172,12 @@ bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize
     // locations in a cleared array (-1)
 
     dataRead = new uint64_t[bufferSize];
+    boolRead = new bool[bufferSize];
     for (uint64_t i = 0; i < bufferSize; i++)
+    {
         dataRead[i] = UINT64_MAX;
+        boolRead[i] = false;
+    }
 
     dataCollector->read(20, "deep/folders/data_without_borders", gridSize, borderSize,
             resultSize, NULL);
@@ -169,6 +188,20 @@ bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize
     dataCollector->read(20, "deep/folders/data_without_borders", gridSize, borderSize,
             resultSize, dataRead);
 
+/*
+    dataCollector->read(20, "deep/folders/data_bool", gridSize, borderSize,
+            resultSize, boolRead);
+
+    for (uint64_t i = 0; i < bufferSize; i++)
+    {
+       if (boolRead[i] % 2 != 0)
+       {
+           resultsCorrect = false;
+           break;
+       }
+    }
+*/
+
     // print out read and written data for debugging purposes
 #if defined TESTS_DEBUG
     for (size_t k = 0; k < gridSize[2]; k++)
@@ -228,7 +261,9 @@ bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize
             }
 
     delete[] dataRead;
+    delete[] boolRead;
     delete[] dataWrite;
+    delete[] boolWrite;
 
     dataCollector->close();
 

tests/include/SimpleDataTest.h

@@ -63,6 +63,7 @@ class SimpleDataTest : public CPPUNIT_NS::TestFixture
 
     ColTypeUInt32 ctUInt32;
     ColTypeUInt64 ctUInt64;
+    ColTypeBool   ctBool;
     DataCollector *dataCollector;
 };