From 08eb138d02e063f43fdcf0176b8292dfbe6872df Mon Sep 17 00:00:00 2001
From: dhickin <fdavid.hickin@diamond.ac.uk>
Date: Wed, 24 Sep 2014 16:51:36 +0100
Subject: [PATCH] Added ntndarray tests for non-extended types and caching.

---
 test/nt/ntndarrayTest.cpp | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/test/nt/ntndarrayTest.cpp b/test/nt/ntndarrayTest.cpp
index 41096b4..4463c2f 100644
--- a/test/nt/ntndarrayTest.cpp
+++ b/test/nt/ntndarrayTest.cpp
@@ -14,21 +14,25 @@ using namespace epics::pvData;
 using std::tr1::dynamic_pointer_cast;
 static FieldCreatePtr fieldCreate = getFieldCreate();
 
-void test_builder()
+void test_builder(bool extraFields)
 {
     testDiag("test_builder");
 
     NTNDArrayBuilderPtr builder = NTNDArray::createBuilder();
     testOk(builder.get() != 0, "Got builder");
 
-    StructureConstPtr structure = builder->
-            addDescriptor()->
-            addTimeStamp()->          
-            addAlarm()->  
-            addDisplay()->  
-            add("extra1",fieldCreate->createScalar(pvString)) ->
-            add("extra2",fieldCreate->createScalarArray(pvString)) ->
-            createStructure();
+    builder->addDescriptor()->
+             addTimeStamp()->          
+             addAlarm()->  
+             addDisplay();
+
+    if (extraFields)
+    {
+        builder->add("extra1",fieldCreate->createScalar(pvString))->
+                 add("extra2",fieldCreate->createScalarArray(pvString));
+    }
+
+    StructureConstPtr structure = builder->createStructure();
     testOk1(structure.get() != 0);
     if (!structure)
         return;
@@ -47,6 +51,11 @@ void test_builder()
     testOk1(structure->getField("alarm").get() != 0);
     testOk1(structure->getField("timeStamp").get() != 0);
     testOk1(structure->getField("display").get() != 0);
+    if (extraFields)
+    {
+        testOk1(structure->getField("extra1").get() != 0);
+        testOk1(structure->getField("extra2").get() != 0);
+    }
     std::cout << *structure << std::endl;
 
 }
@@ -104,8 +113,10 @@ void test_narrow()
 }
 
 MAIN(testNTNDArray) {
-    testPlan(25);
-    test_builder();
+    testPlan(59);
+    test_builder(true);
+    test_builder(false);
+    test_builder(false); // called twice to test caching
     test_all();
     test_narrow();
     return testDone();