Skip to content

Commit b3e81b8

Browse files
committed
added tests
1 parent 9cf62df commit b3e81b8

File tree

3 files changed

+32
-39
lines changed

3 files changed

+32
-39
lines changed

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/Era5PostProcessing.java

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.bc.fiduceo.post.plugin.era5;
22

33
import com.bc.fiduceo.FiduceoConstants;
4-
import com.bc.fiduceo.core.GeoRect;
54
import com.bc.fiduceo.post.PostProcessing;
65
import ucar.ma2.Array;
76
import ucar.ma2.Index;
@@ -36,19 +35,6 @@ private static int getEra5LatMin(float latMax) {
3635
return (int) ((90.0 - scaledLatMax) * 4.0);
3736
}
3837

39-
private static int getEra5LatMax(float latMin) {
40-
final double shiftedLat = latMin - EPS;
41-
final double scaledLatMin = Math.floor(shiftedLat * 4) / 4;
42-
return (int) ((90.0 - scaledLatMin) * 4.0);
43-
}
44-
45-
private static int getEra5LonMax(float lonMax) {
46-
final double shiftedLon = lonMax + EPS;
47-
final double normLonMax = shiftedLon + 180.0;
48-
final double scaledLonMax = Math.ceil(normLonMax * 4) / 4;
49-
return (int) (scaledLonMax * 4);
50-
}
51-
5238
private static int getEra5LonMin(float lonMin) {
5339
final double shiftedLon = lonMin - EPS;
5440
final double normLonMin = shiftedLon + 180.0;
@@ -114,27 +100,6 @@ static InterpolationContext getInterpolationContext(Array lonArray, Array latArr
114100
return context;
115101
}
116102

117-
private static float[] getMinMax(Array floatArray) {
118-
float min = Float.MAX_VALUE;
119-
float max = -Float.MAX_VALUE;
120-
final Index index = floatArray.getIndex();
121-
final int[] shape = floatArray.getShape();
122-
for (int y = 0; y < shape[0]; y++) {
123-
for (int x = 0; x < shape[1]; x++) {
124-
index.set(y, x);
125-
final float value = floatArray.getFloat(index);
126-
if (value < min) {
127-
min = value;
128-
}
129-
if (value > max) {
130-
max = value;
131-
}
132-
}
133-
}
134-
return new float[]{min, max};
135-
}
136-
137-
138103
@Override
139104
protected void prepare(NetcdfFile reader, NetcdfFileWriter writer) {
140105
final Dimension matchupCountDimension = reader.findDimension(FiduceoConstants.MATCHUP_COUNT);

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFields.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@ private void addTimeVariable(SatelliteFieldsConfiguration satFieldsConfig, Netcd
297297
variable.addAttribute(new Attribute("_FillValue", NetCDFUtils.getDefaultFillValue(DataType.INT, false)));
298298
}
299299

300-
private void addAttributes(TemplateVariable template, Variable variable) {
300+
// package access for testing purpose only tb 2020-12-02
301+
static void addAttributes(TemplateVariable template, Variable variable) {
301302
variable.addAttribute(new Attribute("units", template.getUnits()));
302303
variable.addAttribute(new Attribute("long_name", template.getLongName()));
303304
final String standardName = template.getStandardName();

post-processing-tool/src/test/java/com/bc/fiduceo/post/plugin/era5/SatelliteFieldsTest.java

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import org.junit.Test;
55
import ucar.ma2.Array;
66
import ucar.ma2.DataType;
7-
import ucar.nc2.Dimension;
8-
import ucar.nc2.NetcdfFile;
9-
import ucar.nc2.NetcdfFileWriter;
7+
import ucar.nc2.*;
108

119
import java.util.List;
1210
import java.util.Map;
@@ -106,6 +104,33 @@ public void testGetNwpOffset() {
106104
assertEquals(1, nwpOffset[2]);
107105
}
108106

107+
@Test
108+
public void testAddAttributes() {
109+
final TemplateVariable templateVariable = new TemplateVariable("theName", "metres", "a_long_name", "a_standard_name", true);
110+
final Variable variable = mock(Variable.class);
111+
112+
SatelliteFields.addAttributes(templateVariable, variable);
113+
114+
verify(variable, times(1)).addAttribute(new Attribute("units", "metres"));
115+
verify(variable, times(1)).addAttribute(new Attribute("long_name", "a_long_name"));
116+
verify(variable, times(1)).addAttribute(new Attribute("standard_name", "a_standard_name"));
117+
verify(variable, times(1)).addAttribute(new Attribute("_FillValue", 9.96921E36f));
118+
verifyNoMoreInteractions(variable);
119+
}
120+
121+
@Test
122+
public void testAddAttributes_missingStandarName() {
123+
final TemplateVariable templateVariable = new TemplateVariable("Carola", "gramm", "Heffalump", null, true);
124+
final Variable variable = mock(Variable.class);
125+
126+
SatelliteFields.addAttributes(templateVariable, variable);
127+
128+
verify(variable, times(1)).addAttribute(new Attribute("units", "gramm"));
129+
verify(variable, times(1)).addAttribute(new Attribute("long_name", "Heffalump"));
130+
verify(variable, times(1)).addAttribute(new Attribute("_FillValue", 9.96921E36f));
131+
verifyNoMoreInteractions(variable);
132+
}
133+
109134
@Test
110135
public void testSetGetDimensions_2D() {
111136
final NetcdfFile ncFile = mock(NetcdfFile.class);
@@ -136,6 +161,7 @@ public void testSetGetDimensions_2D() {
136161
assertEquals(12, dimension.getLength());
137162

138163
verify(writer, times(3)).addDimension(anyString(), anyInt());
164+
verifyNoMoreInteractions(writer);
139165
}
140166

141167
@Test
@@ -174,6 +200,7 @@ public void testSetGetDimensions_3D() {
174200
assertEquals(12, dimension.getLength());
175201

176202
verify(writer, times(3)).addDimension(anyString(), anyInt());
203+
verifyNoMoreInteractions(writer);
177204
}
178205

179206
private SatelliteFieldsConfiguration createConfig() {

0 commit comments

Comments
 (0)