Added a couple of more unit tests and fixed the return number to 0 in…

…stead of NULL for getting total number of drgs.

test/SIM_test_dr/RUN_test/unit_test.py

@@ -1,5 +1,20 @@
 from trick.unit_test import *
 
+trick_utest.unit_tests.enable() 
+trick_utest.unit_tests.set_file_name( os.getenv("TRICK_HOME") + "/trick_test/SIM_test_dr.xml" ) 
+
+trick_utest.unit_tests.set_test_name( "DRTest" )
+
+######################################################################################################################
+
+test_suite = "drg api"
+
+# Get the number of data recording groups before any drg is created
+num_drgs = trick.get_num_data_record_groups()
+
+# Check the result of trick.get_num_data_record_groups()
+TRICK_EXPECT_EQ( num_drgs , 0 , test_suite , "0 drgs before any created" )
+
 # The first item of each pair is the .dr file name and the second item of each pair is the drg name
 dr_file_name_drg_name_tuple = (('Modified_data/dr_typesASCII.dr', 'DR_typesASCII'), 
                                ('Modified_data/dr_typesBINARY.dr', 'DR_typesBINARY'), 
@@ -10,30 +25,35 @@
 for i in range(num_files):
     exec(open(dr_file_name_drg_name_tuple[i][0]).read())
 
-trick_utest.unit_tests.enable() 
-trick_utest.unit_tests.set_file_name( os.getenv("TRICK_HOME") + "/trick_test/SIM_test_dr.xml" ) 
-
-trick_utest.unit_tests.set_test_name( "DRTest" )
-
-######################################################################################################################
-
-test_suite = "drg api"
-
 # Get the number of data recording groups created
 num_drgs = trick.get_num_data_record_groups()
 
 # Check the result of trick.get_num_data_record_groups()
-TRICK_EXPECT_EQ( num_drgs , 4 , test_suite , "num of dr groups" )
+TRICK_EXPECT_EQ( num_drgs , 4 , test_suite , "num of dr groups = 4" )
 
 # Test trick.get_data_record_group(<drg_name>) for getting the drg pointer by its name
 # Check the name of the obtained drg instead of the drg pointer
 for i in range(num_drgs):
-    TRICK_EXPECT_EQ(  trick.get_data_record_group(dr_file_name_drg_name_tuple[i][1]).get_group_name(), dr_file_name_drg_name_tuple[i][1], test_suite , "get drg by name" )
+    TRICK_EXPECT_EQ(  trick.get_data_record_group(dr_file_name_drg_name_tuple[i][1]).get_group_name(), dr_file_name_drg_name_tuple[i][1], test_suite , "get drg by name " + dr_file_name_drg_name_tuple[i][1] )
 
 # Test trick.get_data_record_group_by_idx(<drg_idx) for getting the drg pointer by its id number
 # Check the name of the obtained drg instead of the drg pointer
 for i in range(num_drgs):
-    TRICK_EXPECT_EQ(  trick.get_data_record_group_by_idx(i).get_group_name(), dr_file_name_drg_name_tuple[i][1], test_suite , "get drg by idx" )
-
+    TRICK_EXPECT_EQ(  trick.get_data_record_group_by_idx(i).get_group_name(), dr_file_name_drg_name_tuple[i][1], test_suite , "get drg by drg id " + str(i) )
+
+is_null = False
+if trick.get_data_record_group(dr_file_name_drg_name_tuple[0][1]+'test') is None :
+    is_null = True
+TRICK_EXPECT_TRUE(  is_null, test_suite , "null drg by nonexistent drg name" )
+
+is_null = False
+if trick.get_data_record_group_by_idx(num_drgs+1) is None :
+    is_null = True
+TRICK_EXPECT_TRUE(  is_null, test_suite , "null drg by drg id 5" )
+
+is_null = False
+if trick.get_data_record_group_by_idx(-1) is None :
+    is_null = True
+TRICK_EXPECT_TRUE(  is_null, test_suite , "null drg by drg id -1" )
 
 trick.stop(1.0)

test/SIM_test_dr/models/dr/include/DR.hh

@@ -6,7 +6,6 @@
 ********************************************************************************/
 #include <wchar.h>
 #include <string>
-#include "trick/DataRecordGroup.hh"
 
 
 #ifndef DR_HH

trick_source/sim_services/DataRecord/data_record_utilities.cpp

@@ -90,7 +90,7 @@ extern "C" int get_num_data_record_groups() {
    if ( the_drd != NULL ) {
         return the_drd->get_groups_size() ;
     }
-    return NULL ;
+    return 0 ;
 }
 
 extern "C" int set_max_size_record_group (const char * in_name, uint64_t bytes ) {