extend the unit tests for FieldSet

ecmwf · Sep 7, 2023 · 7ee251a · 7ee251a
1 parent 9a03a35
commit 7ee251a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/tests/field/fctest_field.F90 b/src/tests/field/fctest_field.F90
@@ -139,8 +139,8 @@ module fcta_Field_fixture
 TEST( test_fieldset )
 implicit none
 
-  type(atlas_FieldSet) :: fieldset
-  type(atlas_Field) :: field
+  type(atlas_FieldSet) :: fieldset, fieldset_2
+  type(atlas_Field) :: field, field_2
 
   write(*,*) "test_fieldset starting"
 
@@ -163,6 +163,15 @@ module fcta_Field_fixture
   FCTEST_CHECK_EQUAL( field%name(), "field_1" )
   field = fieldset%field(3)
   FCTEST_CHECK_EQUAL( field%name(), "field_2" )
+
+  fieldset_2 = atlas_FieldSet()
+  call fieldset_2%add(fieldset)
+  field_2 = fieldset_2%field("field_0")
+  call field_2%rename("field_00")
+  FCTEST_CHECK(fieldset%has("field_00"))
+  field = fieldset%field("field_00")
+  FCTEST_CHECK_EQUAL(field%name(), "field_00")
+
   call fieldset%final()
   write(0,*) "test_fieldset end"
 

diff --git a/src/tests/field/test_fieldset.cc b/src/tests/field/test_fieldset.cc
@@ -71,7 +71,9 @@ CASE("test_fieldset_concatenation") {
     auto field_2_v = array::make_view<double,2>(field_2);
     field_2_v(1,1) = 1.;
 
-    EXPECT_EQ( field_1_v(1,1), 1.);
+    EXPECT(!fieldset_2.has(""));
+    EXPECT_EQ(fieldset_2.field(0).name(), "");
+    EXPECT_EQ(field_1_v(1,1), 1.);
 }
 
 //-----------------------------------------------------------------------------