From 077f76345e9f207e07d666eea3f4a276e726675b Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 28 Mar 2016 10:58:03 -0600
Subject: [PATCH] Tests were not returning errors when an exception was caught.
  This was discovered in support of
 https://github.com/Unidata/netcdf-cxx4/issues/30

---
 cxx4/test_att.cpp        | 21 ++++++------
 cxx4/test_classic.cpp    |  2 +-
 cxx4/test_dim.cpp        | 11 ++++---
 cxx4/test_group.cpp      | 45 ++++++++++++-------------
 cxx4/test_open_close.cpp |  1 +
 cxx4/test_type.cpp       | 71 ++++++++++++++++++++--------------------
 cxx4/test_type2.cpp      | 11 ++++---
 cxx4/test_type3.cpp      | 25 +++++++-------
 cxx4/test_type4.cpp      | 19 ++++++-----
 cxx4/test_type5.cpp      | 19 ++++++-----
 cxx4/test_var.cpp        | 11 ++++---
 cxx4/test_var2.cpp       |  1 +
 12 files changed, 124 insertions(+), 113 deletions(-)

diff --git a/cxx4/test_att.cpp b/cxx4/test_att.cpp
index 7993710..ecc4b8a 100644
--- a/cxx4/test_att.cpp
+++ b/cxx4/test_att.cpp
@@ -20,14 +20,14 @@ int main()
     {
       cout<<"Opening file \"firstFile.cdf\" with NcFile::replace"<<endl;
       NcFile ncFile("firstFile.cdf",NcFile::replace);
-    
+
       cout<<left<<setw(55)<<"Testing addGroup(\"groupName\")";
       NcGroup groupA(ncFile.addGroup("groupA"));
       NcGroup groupA0(ncFile.addGroup("groupA0"));
       NcGroup groupB(groupA.addGroup("groupB"));
       NcGroup groupC(groupA.addGroup("groupC"));
       cout <<"    -----------   passed\n";
-    
+
       cout <<left<<setw(55)<<"Testing putAtt(\"attName\",\"typeName\",len,dataValues)";
       vector<string>  b1(10);
       vector<unsigned char *>  b2(10);
@@ -402,7 +402,7 @@ int main()
 	iter=groupMap.find("att_C1"); if( iter != groupMap.end()) throw NcException("Error in test 8.116",__FILE__,__LINE__);
 
 
-	// now for groupB    
+	// now for groupB
 	groupMap = groupB.getAtts();
 	if(groupMap.size() != 4)                                   throw NcException("Error in test 8.117",__FILE__,__LINE__);
 	iter=groupMap.find("att1_7");  if( iter != groupMap.end()) throw NcException("Error in test 8.118",__FILE__,__LINE__);
@@ -456,7 +456,7 @@ int main()
 
 	cout <<"    -----------   passed\n";
       }
-    
+
       cout <<left<<setw(55)<<"Testing getAtt(\"name\",[netCDF::Location])";
       if(ncFile.getAtt("att1_7") != attA1_7)                            throw NcException("Error in test 9.1",__FILE__,__LINE__);
       if(ncFile.getAtt("att1_7",NcGroup::Current) != attA1_7)           throw NcException("Error in test 9.2",__FILE__,__LINE__);
@@ -498,7 +498,7 @@ int main()
       if(ncFile.getAtt("att_C1",NcGroup::All) != att_C1)               throw NcException("Error in test 9.35",__FILE__,__LINE__);
 
       // now for next group
-    
+
       if(!groupA0.getAtt("att1_7").isNull())                             throw NcException("Error in test 9.36",__FILE__,__LINE__);
       if(!groupA0.getAtt("att1_7",NcGroup::Current).isNull())            throw NcException("Error in test 9.37",__FILE__,__LINE__);
       if(groupA0.getAtt("att1_7",NcGroup::Parents)  != attA1_7)          throw NcException("Error in test 9.38",__FILE__,__LINE__);
@@ -506,7 +506,7 @@ int main()
       if(groupA0.getAtt("att1_7",NcGroup::ParentsAndCurrent) != attA1_7) throw NcException("Error in test 9.40",__FILE__,__LINE__);
       if(!groupA0.getAtt("att1_7",NcGroup::ChildrenAndCurrent).isNull()) throw NcException("Error in test 9.41",__FILE__,__LINE__);
       if(groupA0.getAtt("att1_7",NcGroup::All) != attA1_7)               throw NcException("Error in test 9.42",__FILE__,__LINE__);
-    
+
       if(!groupA0.getAtt("att_A01").isNull())                           throw NcException("Error in test 9.43",__FILE__,__LINE__);
       if(!groupA0.getAtt("att_A01",NcGroup::Current).isNull())          throw NcException("Error in test 9.44",__FILE__,__LINE__);
       if(!groupA0.getAtt("att_A01",NcGroup::Parents).isNull())           throw NcException("Error in test 9.45",__FILE__,__LINE__);
@@ -514,7 +514,7 @@ int main()
       if(!groupA0.getAtt("att_A01",NcGroup::ParentsAndCurrent).isNull()) throw NcException("Error in test 9.47",__FILE__,__LINE__);
       if(!groupA0.getAtt("att_A01",NcGroup::ChildrenAndCurrent).isNull())throw NcException("Error in test 9.48",__FILE__,__LINE__);
       if(!groupA0.getAtt("att_A01",NcGroup::All).isNull())              throw NcException("Error in test 9.49",__FILE__,__LINE__);
-    
+
       if(groupA0.getAtt("att_A1") != att_A1)                            throw NcException("Error in test 9.50",__FILE__,__LINE__);
       if(groupA0.getAtt("att_A1",NcGroup::Current) != att_A1)           throw NcException("Error in test 9.51",__FILE__,__LINE__);
       if(!groupA0.getAtt("att_A1",NcGroup::Parents).isNull())           throw NcException("Error in test 9.52",__FILE__,__LINE__);
@@ -522,7 +522,7 @@ int main()
       if(groupA0.getAtt("att_A1",NcGroup::ParentsAndCurrent) != att_A1)throw NcException("Error in test 9.54",__FILE__,__LINE__);
       if(groupA0.getAtt("att_A1",NcGroup::ChildrenAndCurrent)!= att_A1) throw NcException("Error in test 9.55",__FILE__,__LINE__);
       if(groupA0.getAtt("att_A1",NcGroup::All) != att_A1)               throw NcException("Error in test 9.56",__FILE__,__LINE__);
-    
+
       if(!groupA0.getAtt("att_B3").isNull())                            throw NcException("Error in test 9.57",__FILE__,__LINE__);
       if(!groupA0.getAtt("att_B3",NcGroup::Current).isNull())           throw NcException("Error in test 9.58",__FILE__,__LINE__);
       if(!groupA0.getAtt("att_B3",NcGroup::Parents).isNull())           throw NcException("Error in test 9.59",__FILE__,__LINE__);
@@ -605,7 +605,7 @@ int main()
       if(!groupB.getAtt("att_A1",NcGroup::ParentsAndCurrent).isNull()) throw NcException("Error in test 9.124",__FILE__,__LINE__);
       if(!groupB.getAtt("att_A1",NcGroup::ChildrenAndCurrent).isNull())throw NcException("Error in test 9.125",__FILE__,__LINE__);
       if(!groupB.getAtt("att_A1",NcGroup::All).isNull())               throw NcException("Error in test 9.126",__FILE__,__LINE__);
-    
+
       if(groupB.getAtt("att_B3") != att_B3)                            throw NcException("Error in test 9.127",__FILE__,__LINE__);
       if(groupB.getAtt("att_B3",NcGroup::Current) != att_B3)           throw NcException("Error in test 9.128",__FILE__,__LINE__);
       if(!groupB.getAtt("att_B3",NcGroup::Parents).isNull())           throw NcException("Error in test 9.129",__FILE__,__LINE__);
@@ -817,7 +817,7 @@ int main()
 
 	return 0;
       }
-    
+
 
 
 
@@ -830,5 +830,6 @@ int main()
     {
       cout << "unknown error"<<endl;
       e.what();
+      return e.errorCode();
     }
 }
diff --git a/cxx4/test_classic.cpp b/cxx4/test_classic.cpp
index 0e6b23e..de9e830 100644
--- a/cxx4/test_classic.cpp
+++ b/cxx4/test_classic.cpp
@@ -53,6 +53,6 @@ int main()
    catch(NcException& e)
    {
       cout << "Error!\n";
-      return 99;
+      return e.errorCode();
    }
 }
diff --git a/cxx4/test_dim.cpp b/cxx4/test_dim.cpp
index 9f07d8d..bcfd852 100644
--- a/cxx4/test_dim.cpp
+++ b/cxx4/test_dim.cpp
@@ -19,14 +19,14 @@ int main()
     {
       cout<<"Opening file \"firstFile.cdf\" with NcFile::replace"<<endl;
       NcFile ncFile("firstFile.cdf", NcFile::replace);
-    
+
       cout<<left<<setw(55)<<"Testing addGroup(\"groupName\")";
       NcGroup groupA(ncFile.addGroup("groupA"));
       NcGroup groupA0(ncFile.addGroup("groupA0"));
       NcGroup groupB(groupA.addGroup("groupB"));
       NcGroup groupC(groupA.addGroup("groupC"));
       cout <<"    -----------   passed\n";
-    
+
       cout <<left<<setw(55)<<"Testing addDim(\"dimensionName\")";
       NcDim dim1 = ncFile.addDim("dim1",11);
       NcDim dim2 = ncFile.addDim("dim2");
@@ -105,7 +105,7 @@ int main()
       cout <<"    -----------   passed\n";
 
 
-	
+
       cout <<left<<setw(55)<<"Testing NcGroup::getDims([netCDF::Location])";
       {
 	multimap<string,NcDim> dimMap;
@@ -162,12 +162,12 @@ int main()
 	if( iter == dimMap.end())    throw NcException("Error in test 7.21",__FILE__,__LINE__);
 	iter=dimMap.find("dim7");
 	if( iter == dimMap.end())    throw NcException("Error in test 7.22",__FILE__,__LINE__);
-      
+
       }
       cout <<"    -----------   passed\n";
 
 
-	
+
       cout <<left<<setw(55)<<"Testing NcGroup::getDims(\"name\",[netCDF::Location])";
       {
 
@@ -328,5 +328,6 @@ int main()
     {
       cout <<"\n";
       e.what();
+      return e.errorCode();
     }
 }
diff --git a/cxx4/test_group.cpp b/cxx4/test_group.cpp
index 802553e..9a524ef 100644
--- a/cxx4/test_group.cpp
+++ b/cxx4/test_group.cpp
@@ -16,14 +16,14 @@ try
   {
     cout<<"Opening file \"firstFile.cdf\" with NcFile::replace"<<endl;
     NcFile ncFile("firstFile.cdf",NcFile::replace);
-    
+
     cout<<left<<setw(50)<<"Testing addGroup(\"groupName\")";
     NcGroup groupA(ncFile.addGroup("groupA"));
     NcGroup groupA0(ncFile.addGroup("groupA0"));
     NcGroup groupB(groupA.addGroup("groupB"));
     NcGroup groupC(groupA.addGroup("groupC"));
     cout <<"    -----------   passed\n";
-    
+
     cout <<left<<setw(50)<<"Testing getGroupCount([netCDF::Location])";
     if( ncFile.getGroupCount()!= 2)                                 throw NcException("Error in test 1.1",__FILE__,__LINE__);
     if( groupA.getGroupCount()!= 2)                                 throw NcException("Error in test 1.2",__FILE__,__LINE__);
@@ -53,14 +53,14 @@ try
       if( iter == groupMap.end())    throw NcException("Error in test 2.2",__FILE__,__LINE__);
       iter=groupMap.find("groupA0");
       if( iter == groupMap.end())    throw NcException("Error in test 2.3",__FILE__,__LINE__);
-      
+
       groupMap =ncFile.getGroups(NcGroup::ChildrenGrps);
       if( groupMap.size() != 2)      throw NcException("Error in test 2.4",__FILE__,__LINE__);
       iter=groupMap.find("groupA");
       if( iter == groupMap.end())    throw NcException("Error in test 2.5",__FILE__,__LINE__);
       iter=groupMap.find("groupA0");
       if( iter == groupMap.end())    throw NcException("Error in test 2.6",__FILE__,__LINE__);
-      
+
       groupMap = ncFile.getGroups(NcGroup::ParentsGrps);
       if( groupMap.size() != 0)      throw NcException("Error in test 2.7",__FILE__,__LINE__);
 
@@ -81,7 +81,7 @@ try
       if( iter == groupMap.end())    throw NcException("Error in test 2.14",__FILE__,__LINE__);
       iter=groupMap.find("groupC");
       if( iter == groupMap.end())    throw NcException("Error in test 2.15",__FILE__,__LINE__);
-      
+
       groupMap = ncFile.getGroups(NcGroup::ParentsAndCurrentGrps);
       if( groupMap.size() != 1)      throw NcException("Error in test 2.16",__FILE__,__LINE__);
       iter=groupMap.find("/");
@@ -109,7 +109,7 @@ try
       if( iter == groupMap.end())    throw NcException("Error in test 2.25",__FILE__,__LINE__);
       iter=groupMap.find("groupC");
       if( iter == groupMap.end())    throw NcException("Error in test 2.26",__FILE__,__LINE__);
-      
+
 
       groupMap =groupA.getGroups(NcGroup::ChildrenGrps);
       if( groupMap.size() != 2)      throw NcException("Error in test 2.27",__FILE__,__LINE__);
@@ -117,7 +117,7 @@ try
       if( iter == groupMap.end())    throw NcException("Error in test 2.28",__FILE__,__LINE__);
       iter=groupMap.find("groupC");
       if( iter == groupMap.end())    throw NcException("Error in test 2.29",__FILE__,__LINE__);
-      
+
       groupMap = groupA.getGroups(NcGroup::ParentsGrps);
       if( groupMap.size() != 1)      throw NcException("Error in test 2.30",__FILE__,__LINE__);
       iter=groupMap.find("/");
@@ -132,7 +132,7 @@ try
       if( iter == groupMap.end())    throw NcException("Error in test 2.34",__FILE__,__LINE__);
       iter=groupMap.find("groupC");
       if( iter == groupMap.end())    throw NcException("Error in test 2.35",__FILE__,__LINE__);
-      
+
       groupMap = groupA.getGroups(NcGroup::ParentsAndCurrentGrps);
       if( groupMap.size() != 2)      throw NcException("Error in test 2.36",__FILE__,__LINE__);
       iter=groupMap.find("/");
@@ -158,7 +158,7 @@ try
 
       groupMap =groupB.getGroups(NcGroup::ChildrenGrps);
       if( groupMap.size() != 0)      throw NcException("Error in test 2.45",__FILE__,__LINE__);
-      
+
       groupMap = groupB.getGroups(NcGroup::ParentsGrps);
       if( groupMap.size() != 2)      throw NcException("Error in test 2.46",__FILE__,__LINE__);
       iter=groupMap.find("/");
@@ -171,7 +171,7 @@ try
 
       groupMap = groupB.getGroups(NcGroup::AllChildrenGrps);
       if( groupMap.size() != 0)      throw NcException("Error in test 2.50",__FILE__,__LINE__);
-      
+
       groupMap = groupB.getGroups(NcGroup::ParentsAndCurrentGrps);
       if( groupMap.size() != 3)      throw NcException("Error in test 2.51",__FILE__,__LINE__);
       iter=groupMap.find("/");
@@ -226,7 +226,7 @@ try
 
       groupSet = ncFile.getGroups("groupA",NcGroup::AllGrps);
       if( groupSet.size() != 1)      throw NcException("Error in test 3.9",__FILE__,__LINE__);
-      
+
 
       // operations on ncFile:groupB
 
@@ -250,7 +250,7 @@ try
 
       groupSet = ncFile.getGroups("groupB",NcGroup::AllGrps);
       if( groupSet.size() != 1)      throw NcException("Error in test 3.16",__FILE__,__LINE__);
-      
+
 
       // operations on groupA:groupA
 
@@ -274,7 +274,7 @@ try
 
       groupSet = groupA.getGroups("groupA",NcGroup::AllGrps);
       if( groupSet.size() != 1)      throw NcException("Error in test 3.23",__FILE__,__LINE__);
-      
+
 
 
       // operations on groupA:ncFile
@@ -299,7 +299,7 @@ try
 
       groupSet = groupA.getGroups("/",NcGroup::AllGrps);
       if( groupSet.size() != 1)      throw NcException("Error in test 3.30",__FILE__,__LINE__);
-      
+
 
 
       // operations on groupA:groupB
@@ -324,7 +324,7 @@ try
 
       groupSet = groupA.getGroups("groupB",NcGroup::AllGrps);
       if( groupSet.size() != 1)      throw NcException("Error in test 3.37",__FILE__,__LINE__);
-      
+
 
       // operations on groupA:groupA0
 
@@ -348,13 +348,13 @@ try
 
       groupSet = groupA.getGroups("groupA0",NcGroup::AllGrps);
       if( groupSet.size() != 0)      throw NcException("Error in test 3.44",__FILE__,__LINE__);
-      
+
     }
 
     cout <<"    -----------   passed\n";
-    
-    
-    
+
+
+
 
 
     cout <<left<<setw(50)<<"Testing getGroup(\"name\",[netCDF::Location])";
@@ -364,11 +364,11 @@ try
 
       if( ncFile.getGroup("groupA").getName() != "groupA")  throw NcException("Error in test 4.1",__FILE__,__LINE__);
       if( !ncFile.getGroup("groupB").isNull())              throw NcException("Error in test 4.2",__FILE__,__LINE__);
-      
+
     }
 
     cout <<"    -----------   passed\n";
-    
+
 
 
 
@@ -379,7 +379,7 @@ try
     if( groupA0.getParentGroup().getName() != "/")    throw NcException("Error in test 5.3",__FILE__,__LINE__);
     if( groupB.getParentGroup().getName() != "groupA")throw NcException("Error in test 5.4",__FILE__,__LINE__);
     if( groupC.getParentGroup().getName() != "groupA")throw NcException("Error in test 5.5",__FILE__,__LINE__);
-    
+
     cout <<"    -----------   passed\n";
 
 
@@ -388,5 +388,6 @@ try
    {
      cout << "unknown error"<<endl;
      e.what();
+     return e.errorCode();
    }
 }
diff --git a/cxx4/test_open_close.cpp b/cxx4/test_open_close.cpp
index 6624bec..7b9cdbf 100644
--- a/cxx4/test_open_close.cpp
+++ b/cxx4/test_open_close.cpp
@@ -29,6 +29,7 @@ int main() {
       return -1;
     } catch(NcException &e) {
       cout << "Caught Expected Exception." << endl;
+      return e.errorCode();
     }
 
     // Test opening a file that exists.
diff --git a/cxx4/test_type.cpp b/cxx4/test_type.cpp
index 12d0eee..2b6ee1a 100644
--- a/cxx4/test_type.cpp
+++ b/cxx4/test_type.cpp
@@ -27,14 +27,14 @@ try
   {
     cout<<"Opening file \"firstFile.cdf\" with NcFile::replace"<<endl;
     NcFile ncFile("firstFile.cdf",NcFile::replace);
-    
+
     cout<<left<<std::setw(57)<<"Testing addGroup(\"groupName\")";
     NcGroup groupA(ncFile.addGroup("groupA"));
     NcGroup groupA0(ncFile.addGroup("groupA0"));
     NcGroup groupB(groupA.addGroup("groupB"));
     NcGroup groupC(groupA.addGroup("groupC"));
     cout <<"    -----------   passed\n";
-    
+
     vector<string>  b1(10);
     vector<unsigned char *>  b2(10);
     vector<signed char*>  b3(10);
@@ -134,7 +134,7 @@ try
     if( ncString.getTypeClassName() !=  "nc_STRING") throw NcException("Error in test 5.12",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
 
-    
+
 
     cout <<left<<setw(57)<<"Testing creating new Compound Type";
     struct struct1{
@@ -143,7 +143,7 @@ try
       short mem3;
       double mem4;
     };
-    
+
     struct struct2{
       char mem1;
       double mem2;
@@ -179,7 +179,7 @@ try
     if(compoundType2.getTypeClass() != NcCompoundType::nc_COMPOUND) throw NcException("Error in test 8.3",__FILE__,__LINE__);
     if(dummyType.getTypeClass() != NcCompoundType::nc_COMPOUND)     throw NcException("Error in test 8.4",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
-    
+
     cout <<left<<setw(57)<<"Testing compoundClass.getMemberCount()";
     if(compoundType2.getMemberCount() != 3)throw NcException("Error in test 9.1",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
@@ -189,7 +189,7 @@ try
     if(compoundType2.getMemberDimCount(1) != 0)throw NcException("Error in test 10.2",__FILE__,__LINE__);
     if(compoundType2.getMemberDimCount(2) != 2)throw NcException("Error in test 10.3",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
-    
+
 
     cout <<left<<setw(57)<<"Testing NcCompoundType::getMemberShape(index)";
     vector<int> memberShape;
@@ -204,14 +204,14 @@ try
     if(memberShape[0] != 6)    throw NcException("Error in test 11.4",__FILE__,__LINE__);
     if(memberShape[1] != 3)    throw NcException("Error in test 11.5",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
-    
+
 
     cout <<left<<setw(57)<<"Testing NcCompoundType::getMember(index).getName()";
     if(compoundType2.getMember(0).getName() !=  "char")   throw NcException("Error in test 12.1",__FILE__,__LINE__);
     if(compoundType2.getMember(1).getName() !=  "double") throw NcException("Error in test 12.2",__FILE__,__LINE__);
     if(compoundType2.getMember(2).getName() !=  "short")  throw NcException("Error in test 12.3",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
-    
+
 
     cout <<left<<setw(57)<<"Testing NcCompoundType == NcType";
     NcType dummyType2(compoundType2);
@@ -222,7 +222,7 @@ try
     NcCompoundType dummy3(compoundType2);
     if(!(dummy3 == compoundType2)) throw NcException("Error in test 14.1",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
-    
+
 
     ////////////////////////////
 
@@ -234,15 +234,15 @@ try
     cout <<left<<setw(57)<<"Testing NcVlenType::getTypeClass()";
     if(vlenType1.getTypeClass() != NcType::nc_VLEN) throw NcException("Error in test 15.1",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
-    
+
     cout <<left<<setw(57)<<"Testing NcVlenType::getTypeClassName()";
     if(vlenType1.getTypeClassName() != "nc_VLEN") throw NcException("Error in test 16.1",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
-    
+
     cout <<left<<setw(57)<<"Testing NcVlenType::getName()";
     if(vlenType1.getName() != "vlenType_1") throw NcException("Error in test 17.1",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
-    
+
     cout <<left<<setw(57)<<"Testing NcVlenType::getBaseType(); == and !=";
     if(!(vlenType1.getBaseType() == ncShort)) throw NcException("Error in test 18.1",__FILE__,__LINE__);
     if(vlenType1.getBaseType() != ncShort) throw NcException("Error in test 18.2",__FILE__,__LINE__);
@@ -255,7 +255,7 @@ try
     if(vlenType1 != vlenvlenType) throw NcException("Error in test 19.1",__FILE__,__LINE__);
     if(vlenType1 != typevlen) throw NcException("Error in test 19.2",__FILE__,__LINE__);
     cout <<"    -----------   passed\n";
-    
+
 
 
 
@@ -340,7 +340,7 @@ try
     ncFile.getTypes(NcType::nc_ENUM);
     ncFile.getTypes("enumType_1");
     ncFile.getTypes();
-    
+
 
 
     cout <<left<<setw(57)<<"Testing ENUM ncFile::putVar() and NcFile::getVar()";
@@ -358,10 +358,10 @@ try
       enumValues[7] =  1;
       enumValues[8] =  -20;
       enumValues[9] =  7;
-      var_1.putVar(enumValues);  
+      var_1.putVar(enumValues);
 
       NcVar var_2(ncFile.getVar("var_1"));
-      
+
       if(var_2.isNull()) throw NcException("Error in test 27.1",__FILE__,__LINE__);
       short enumValues2[10];
       var_2.getVar(enumValues2);
@@ -377,15 +377,15 @@ try
       if(enumValues[9] != 7)  throw NcException("Error in test 27.11",__FILE__,__LINE__);
     }
     cout <<"    -----------   passed\n";
- 
-  
+
+
 
 
 
     cout <<left<<setw(57)<<"Testing COMPOUND ncFile::putVar() and NcFile::getVar()";
     {
       vector<int> vecSize(2); vecSize[0]=6,vecSize[1]=3;
-      
+
       NcCompoundType compoundType3(ncFile.addCompoundType("compoundType_3",sizeof(struct3)));
       compoundType3.addMember("member1",ncInt,offsetof(struct3,mem1));
       compoundType3.addMember("member2",ncDouble,offsetof(struct3,mem2));
@@ -394,52 +394,52 @@ try
 
       NcDim dim3 = ncFile.addDim("dim3",2);
       NcVar var_3   = ncFile.addVar("var_3", compoundType3,dim3);
-      
+
       struct3 dummyStruct;
       dummyStruct.mem1=1;
       dummyStruct.mem2=-1.23456;
       dummyStruct.mem3[0]=1;
       dummyStruct.mem3[1]=-6;
       dummyStruct.mem3[2]=20;
-      
+
       struct3 dummyFill   ;
       dummyFill.mem1=94;
       dummyFill.mem2=95;
       dummyFill.mem3[0]=96;
       dummyFill.mem3[1]=97;
       dummyFill.mem3[2]=98;
-      
+
       struct3 dummyStruct2[2];
       dummyStruct2[0].mem1=1;
       dummyStruct2[0].mem2=-1.23456;
       dummyStruct2[0].mem3[0]=1;
       dummyStruct2[0].mem3[1]=-6;
       dummyStruct2[0].mem3[2]=20;
-      
+
       var_3.setFill(true,dummyFill);
 
       vector<size_t> index(1);index[0]=1;
-      //var_3.putVar(&dummyStruct2);  
-      var_3.putVar(index,&dummyStruct);  
-      
+      //var_3.putVar(&dummyStruct2);
+      var_3.putVar(index,&dummyStruct);
+
       NcVar var_4(ncFile.getVar("var_3"));
 
       if(var_4.isNull()) throw NcException("Error in test 28.1",__FILE__,__LINE__);
       struct3 dummyStruct3[2];
       var_4.getVar(dummyStruct3);
-	  
+
       if(dummyStruct3[1].mem1 != 1)  throw NcException("Error in test 28.2",__FILE__,__LINE__);
       if(dummyStruct3[1].mem2 != -1.23456)  throw NcException("Error in test 28.3",__FILE__,__LINE__);
       if(dummyStruct3[1].mem3[0] != 1)  throw NcException("Error in test 28.4",__FILE__,__LINE__);
       if(dummyStruct3[1].mem3[1] != -6)  throw NcException("Error in test 28.5",__FILE__,__LINE__);
       if(dummyStruct3[1].mem3[2] != 20)  throw NcException("Error in test 28.6",__FILE__,__LINE__);
-      
+
       if(dummyStruct3[0].mem1 != 94)  throw NcException("Error in test 28.7",__FILE__,__LINE__);
       if(dummyStruct3[0].mem2 != 95)  throw NcException("Error in test 28.8",__FILE__,__LINE__);
       if(dummyStruct3[0].mem3[0] != 96)  throw NcException("Error in test 28.9",__FILE__,__LINE__);
       if(dummyStruct3[0].mem3[1] != 97)  throw NcException("Error in test 28.10",__FILE__,__LINE__);
       if(dummyStruct3[0].mem3[2] != 98)  throw NcException("Error in test 28.11",__FILE__,__LINE__);
-      
+
     }
     cout <<"    -----------   passed\n";
 
@@ -472,7 +472,7 @@ try
       dummyData[1].p = vlenPointer;
       dummyData[1].len = 2;
 
-      var_7.putVar(dummyData);  
+      var_7.putVar(dummyData);
 
        nc_free_vlen(&dummyData[0]);
        nc_free_vlen(&dummyData[1]);
@@ -521,7 +521,7 @@ try
       // finally define a variable containing this new compound type
       NcDim dim13 = ncFile.addDim("dim13",2);
       NcVar var_13   = ncFile.addVar("var_13", compoundType4,dim13);
-      
+
       // here we populate a single entry.
       struct10 dummyData2;
       short int* vlenPointer;
@@ -539,12 +539,12 @@ try
       vlenPointer[1] = 64;
       dummyData2.mem1[1].p=vlenPointer;
       dummyData2.mem1[1].len=2;
-      
+
       dummyData2.mem2=20.1234;
 
       // ...and put the data into the netCDF file
       vector<size_t> index(1);index[0]=1;
-      var_13.putVar(index,&dummyData2);  
+      var_13.putVar(index,&dummyData2);
 
       nc_free_vlen(&dummyData2.mem1[0]);
       nc_free_vlen(&dummyData2.mem1[1]);
@@ -552,13 +552,14 @@ try
 
     }
     cout <<"    -----------   passed\n";
-      
 
- 
+
+
 }
 catch (NcException& e)
   {
     cout << "unknown error"<<endl;
     cout << e.what();
+    exit e.errorCode();
   }
 }
diff --git a/cxx4/test_type2.cpp b/cxx4/test_type2.cpp
index 60f5281..fac2dc7 100644
--- a/cxx4/test_type2.cpp
+++ b/cxx4/test_type2.cpp
@@ -27,7 +27,7 @@ try
 	short mem3[3];
       };
       vector<int> vecSize(2); vecSize[0]=6,vecSize[1]=3;
-      
+
       NcCompoundType compoundType3(ncFile.addCompoundType("compoundType_3",sizeof(struct3)));
       compoundType3.addMember("member1",ncInt,offsetof(struct3,mem1));
       compoundType3.addMember("member2",ncDouble,offsetof(struct3,mem2));
@@ -36,17 +36,17 @@ try
 
       NcDim dim3 = ncFile.addDim("dim3",1);
       NcVar var_3   = ncFile.addVar("var_3", compoundType3,dim3);
-      
+
       struct3 dummyStruct;
       dummyStruct.mem1=1;
       dummyStruct.mem2=-1.23456;
       dummyStruct.mem3[0]=1;
       dummyStruct.mem3[1]=-6;
       dummyStruct.mem3[2]=20;
-      
+
       vector<size_t> index(1);index[0]=0;
-      var_3.putVar(index,&dummyStruct);  
-      
+      var_3.putVar(index,&dummyStruct);
+
       //NcVar var_4(ncFile.getVar("var_3"));
 
       exit(1);
@@ -55,5 +55,6 @@ catch (NcException& e)
   {
     cout << "unknown error"<<endl;
     e.what();
+    return e.errorCode();
   }
 }
diff --git a/cxx4/test_type3.cpp b/cxx4/test_type3.cpp
index 44e3cd1..76ea49e 100644
--- a/cxx4/test_type3.cpp
+++ b/cxx4/test_type3.cpp
@@ -30,28 +30,28 @@ try
       nc_vlen_t mem4;
     };
     vector<int> vecSize(2); vecSize[0]=6,vecSize[1]=3;
-    
+
     NcVlenType vlenType(ncFile.addVlenType("vlenType_1",ncDouble));
-    
-    
+
+
     NcCompoundType compoundType3(ncFile.addCompoundType("compoundType_3",sizeof(struct3)));
     compoundType3.addMember("member1",ncInt,offsetof(struct3,mem1));
     compoundType3.addMember("member2",ncDouble,offsetof(struct3,mem2));
     vector<int> mem3Shape(1);mem3Shape[0]=mem3Size;
     compoundType3.addMember("member3",ncDouble,offsetof(struct3,mem3),mem3Shape);
     compoundType3.addMember("member4",vlenType,offsetof(struct3,mem4));
-    
+
     NcDim dim3 = ncFile.addDim("dim3");
     NcVar var_3   = ncFile.addVar("var_3", compoundType3,dim3);
     // set the fill value
-    
+
     struct3 fillValue;
     fillValue.mem1=0;
     fillValue.mem2=0.0;
     for(int j=0;j<mem3Size;j++)fillValue.mem3[j]=0;
     fillValue.mem4.p=NULL;
     fillValue.mem4.len=vlenSize;
-    
+
 #if 1
     //var_3.setFill(true,&fillValue);
     // set the chunking;
@@ -74,21 +74,22 @@ try
       vlenPointer[j] = j*j+1.;//double(j)/1.21467;
     dummyStruct.mem4.p=vlenPointer;
     dummyStruct.mem4.len=vlenSize;
-    
+
     vector<size_t> index(1);
-    
+
     for (int i=0; i< 100;i++) {
       index[0]=i;
-      var_3.putVar(index,&dummyStruct);  
-    }      
-    
+      var_3.putVar(index,&dummyStruct);
+    }
+
     nc_free_vlen(&dummyStruct.mem4);
     exit(1);
-    
+
   }
  catch (NcException& e)
    {
      cout << "unknown error"<<endl;
      e.what();
+     return e.errorCode();
    }
 }
diff --git a/cxx4/test_type4.cpp b/cxx4/test_type4.cpp
index 7e753ea..8dfa879 100644
--- a/cxx4/test_type4.cpp
+++ b/cxx4/test_type4.cpp
@@ -28,7 +28,7 @@ try
       double mem3[mem3Size];
       int mem2[mem2Size];
     };
-    
+
     NcCompoundType compoundType3(ncFile.addCompoundType("compoundType_3",sizeof(struct3)));
     vector<int> mem2Shape(1);mem2Shape[0]=mem2Size;
     vector<int> mem3Shape(1);mem3Shape[0]=mem3Size;
@@ -38,10 +38,10 @@ try
     NcDim dim3 = ncFile.addDim("dim3");
     NcVar var_3   = ncFile.addVar("var_3", compoundType3,dim3);
     // set the fill value
-    
+
     struct3 fillValue;
     for(int j=0;j<mem3Size;j++)fillValue.mem3[j]=0;
-    
+
 #if 1
     //    var_3.setFill(true,&fillValue);
     // set the chunking;
@@ -60,19 +60,20 @@ try
       dummyStruct.mem2[j]=-(j*j*j-134597);
     for(int j=0;j<mem3Size;j++)
       dummyStruct.mem3[j]=j*j+1;
-    
+
     vector<size_t> index(1);
-    
+
     for (int i=0; i< 1000;i++) {
       index[0]=i;
-      var_3.putVar(index,&dummyStruct);  
-    }      
-    
-    
+      var_3.putVar(index,&dummyStruct);
+    }
+
+
   }
  catch (NcException& e)
    {
      cout << "unknown error"<<endl;
      e.what();
+     return e.errorCode();
    }
 }
diff --git a/cxx4/test_type5.cpp b/cxx4/test_type5.cpp
index cb1d213..f551fc7 100644
--- a/cxx4/test_type5.cpp
+++ b/cxx4/test_type5.cpp
@@ -25,7 +25,7 @@ try
     struct struct3{
       double mem3[mem3Size];
     };
-    
+
     NcCompoundType compoundType3(ncFile.addCompoundType("compoundType_3",sizeof(struct3)));
     vector<int> mem3Shape(1);mem3Shape[0]=mem3Size;
     compoundType3.addMember("member3",ncDouble,offsetof(struct3,mem3),mem3Shape);
@@ -39,7 +39,7 @@ try
     // set the fill value
     struct3 fillValue;
     for(int j=0;j<mem3Size;j++)fillValue.mem3[j]=0;
-    
+
 #if 1
     //var_3.setFill(true,&fillValue);
     // set the chunking;
@@ -63,22 +63,23 @@ try
     struct3 dummyStruct2;
     for(int j=0;j<mem3Size;j++)
       dummyStruct2.mem3[j]=-1./(j*j*j+1);
-    
+
     vector<size_t> index(2);
-    
+
     for (int i=0; i< 100;i++) {
       index[1]=i;
       index[0]=0;
-      var_3.putVar(index,&dummyStruct);  
+      var_3.putVar(index,&dummyStruct);
       index[0]=1;
-      var_3.putVar(index,&dummyStruct2);  
-    }      
-    
-    
+      var_3.putVar(index,&dummyStruct2);
+    }
+
+
   }
  catch (NcException& e)
    {
      cout << "unknown error"<<endl;
      e.what();
+     return e.errorCode();
    }
 }
diff --git a/cxx4/test_var.cpp b/cxx4/test_var.cpp
index 8d649ee..23147d1 100644
--- a/cxx4/test_var.cpp
+++ b/cxx4/test_var.cpp
@@ -21,14 +21,14 @@ int main()
       {
 	cout<<"Opening file \"firstFile.cdf\" with NcFile::replace"<<endl;
 	NcFile ncFile("firstFile.cdf",NcFile::replace);
-    
+
 	cout<<left<<setw(55)<<"Testing addGroup(\"groupName\")";
 	NcGroup groupA(ncFile.addGroup("groupA"));
 	NcGroup groupA0(ncFile.addGroup("groupA0"));
 	NcGroup groupB(groupA.addGroup("groupB"));
 	NcGroup groupC(groupA.addGroup("groupC"));
 	cout <<"    -----------   passed\n";
-    
+
 	cout <<left<<setw(55)<<"Testing addVar(\"varName\",\"typeName\")";
 	NcVar var_scalar  = ncFile.addVar("var_scalar",ncByte);
 	cout <<"    -----------   passed\n";
@@ -73,12 +73,12 @@ int main()
 
       cout<<"Preparing for tests..."<<endl;
       NcFile ncFile("firstFile.cdf",NcFile::replace);
-    
+
       NcGroup groupA(ncFile.addGroup("groupA"));
       NcGroup groupA0(ncFile.addGroup("groupA0"));
       NcGroup groupB(groupA.addGroup("groupB"));
       NcGroup groupC(groupA.addGroup("groupC"));
-    
+
       NcDim dim1 = ncFile.addDim("dim1",11);
       NcDim dim2 = ncFile.addDim("dim2");
       NcDim dim3 = ncFile.addDim("dim3",13);
@@ -136,7 +136,7 @@ int main()
 	if(groupA.getVarCount(NcGroup::ChildrenAndCurrent) !=11) throw NcException("Error in test 4.20",__FILE__,__LINE__);
 	if(groupA.getVarCount(NcGroup::All) != 12 )              throw NcException("Error in test 4.21",__FILE__,__LINE__);
 	cout <<"    -----------   passed\n";
-	
+
       }
 
 
@@ -813,5 +813,6 @@ int main()
     {
       cout << "unknown error"<<endl;
       e.what();
+      return e.errorCode();
     }
 }
diff --git a/cxx4/test_var2.cpp b/cxx4/test_var2.cpp
index f6a2c59..e68f917 100644
--- a/cxx4/test_var2.cpp
+++ b/cxx4/test_var2.cpp
@@ -188,5 +188,6 @@ int main()
     {
       cout << "unknown error"<<endl;
       e.what();
+      return e.errorCode();
     }
 }