Add tests for aggregations with a renamed dimension

Unidata · Apr 15, 2024 · 487cc5d · 487cc5d
1 parent 5ff59f4
commit 487cc5d
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 0 deletions.
diff --git a/cdm/core/src/test/data/ncml/aggregationRenameDim.xml b/cdm/core/src/test/data/ncml/aggregationRenameDim.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netcdf xmlns="http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2">
+
+  <dimension name="newTime" orgName="time"/>
+  <variable name="newTime" orgName="time" />
+  <variable name="newTime" shape="newTime" />
+  <variable name="P" shape="newTime lat lon" />
+  <variable name="T" shape="newTime lat lon" />
+
+  <aggregation dimName="time" type="joinExisting">
+    <netcdf location="nc/jan.nc"/>
+    <netcdf location="nc/feb.nc"/>
+  </aggregation>
+</netcdf>
diff --git a/cdm/core/src/test/data/ncml/aggregationScanRenameDim.xml b/cdm/core/src/test/data/ncml/aggregationScanRenameDim.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netcdf xmlns="http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2">
+
+  <dimension name="newTime" orgName="time"/>
+  <variable name="newTime" orgName="time" />
+  <variable name="newTime" shape="newTime" />
+  <variable name="P" shape="newTime lat lon" />
+  <variable name="T" shape="newTime lat lon" />
+
+  <aggregation dimName="time" type="joinExisting">
+    <scan location="nc/" regExp="^(jan.nc|feb.nc)$"/>
+  </aggregation>
+</netcdf>
diff --git a/cdm/core/src/test/java/ucar/nc2/internal/ncml/TestNcmlModifyDim.java b/cdm/core/src/test/java/ucar/nc2/internal/ncml/TestNcmlModifyDim.java
@@ -43,4 +43,30 @@ public void shouldRenameDim() throws IOException {
       assertThat(dataIter.getIntNext()).isEqualTo(18);
     }
   }
+
+  @Test
+  public void shouldRenameDimInAggregation() throws IOException {
+    final String filename = "file:./" + TestNcmlRead.topDir + "aggregationRenameDim.xml";
+
+    try (NetcdfFile ncfile = NcmlReader.readNcml(filename, null, null).build()) {
+      Dimension newDim = ncfile.findDimension("newTime");
+      assertThat(newDim).isNotNull();
+
+      Dimension oldDim = ncfile.findDimension("time");
+      assertThat(oldDim).isNull();
+    }
+  }
+
+  @Test
+  public void shouldRenameDimInAggregationScan() throws IOException {
+    final String filename = "file:./" + TestNcmlRead.topDir + "aggregationScanRenameDim.xml";
+
+    try (NetcdfFile ncfile = NcmlReader.readNcml(filename, null, null).build()) {
+      Dimension newDim = ncfile.findDimension("newTime");
+      assertThat(newDim).isNotNull();
+
+      Dimension oldDim = ncfile.findDimension("time");
+      assertThat(oldDim).isNull();
+    }
+  }
 }