rebase to master, enable unit tests

ESMCI · Jul 28, 2017 · ff252f6 · ff252f6
1 parent c3a12e9
commit ff252f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/drivers/mct/unit_test/CMakeLists.txt b/src/drivers/mct/unit_test/CMakeLists.txt
@@ -62,3 +62,4 @@ add_subdirectory(seq_map_test)
 add_subdirectory(glc_elevclass_test)
 add_subdirectory(map_glc2lnd_test)
 add_subdirectory(map_lnd2rof_irrig_test)
+add_subdirectory(check_fields_test)
diff --git a/src/drivers/mct/unit_test/check_fields_test/test_check_fields.pf b/src/drivers/mct/unit_test/check_fields_test/test_check_fields.pf
@@ -11,7 +11,6 @@ module test_check_fields
   use create_mapper_mod
   use shr_kind_mod, only : r8 => shr_kind_r8
   use shr_infnan_mod, only : shr_infnan_nan, assignment(=)
-
   implicit none
 
   @TestCase
@@ -51,7 +50,7 @@ contains
     actual_rlist = mct_aVect_exportRList2c(this%comp%c2x_cc)
     @assertEqual('foo', trim(actual_rlist))
 
-!    this%comp%c2x_cc%rattr(1,3) = nan
+    this%comp%c2x_cc%rattr(1,3) = nan
 
     this%comp%name = 'pfunittest'
 
@@ -60,6 +59,7 @@ contains
     call create_gsmap(this%comp%gsmap_cc, lsize)
 
     call check_fields(this%comp, 1)
+    @assertExceptionRaised('ABORTED:  component_mod:check_fields NaN found in pfunittest instance:            1  field foo 1d global index:            3')
 
   end subroutine createAVectWithoutData_1Field_checkField
 
@@ -93,7 +93,7 @@ contains
 
     call check_fields(this%comp, 1)
 
-
+    @assertExceptionRaised('ABORTED:  component_mod:check_fields NaN found in pfunittest instance:            1  field foo2 1d global index:            3')
   end subroutine createAVectWithoutData_3Field_checkFields
 
 end module test_check_fields