Skip to content

Commit 00601c4

Browse files
TomBlockTomBlock
committed
finished integration test
1 parent 9e5b73d commit 00601c4

File tree

3 files changed

+64
-39
lines changed

3 files changed

+64
-39
lines changed

‎core/src/main/java/com/bc/fiduceo/reader/insitu/tao/TaoReader.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,15 @@ public TimeLocator getTimeLocator() throws IOException {
155155

156156
@Override
157157
public int[] extractYearMonthDayFromFilename(String fileName) {
158-
throw new RuntimeException("not implemented");
158+
final int endIdx = fileName.indexOf(".txt");
159+
final String yearString = fileName.substring(endIdx - 7, endIdx - 3);
160+
final String monthString = fileName.substring(endIdx - 2, endIdx);
161+
162+
final int[] ymd = new int[3];
163+
ymd[0] = Integer.parseInt(yearString);
164+
ymd[1] = Integer.parseInt(monthString);
165+
ymd[2] = 1;
166+
return ymd;
159167
}
160168

161169
@Override

‎core/src/test/java/com/bc/fiduceo/reader/insitu/tao/TaoReaderTest.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,4 +224,13 @@ public void testGetSubScenePixelLocator() throws IOException {
224224
// expected
225225
}
226226
}
227+
228+
@Test
229+
public void testExtractYMDFromFileName() {
230+
final int[] ymd = reader.extractYearMonthDayFromFilename("TRITON_TR0N156E_1998_2017-10.txt");
231+
assertEquals(3, ymd.length);
232+
assertEquals(2017, ymd[0]);
233+
assertEquals(10, ymd[1]);
234+
assertEquals(1, ymd[2]);
235+
}
227236
}

‎matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolIntegrationTest_SMOSL1_tao_sss.java‎

Lines changed: 46 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,35 @@
11
package com.bc.fiduceo.matchup;
22

3+
import com.bc.fiduceo.FiduceoConstants;
4+
import com.bc.fiduceo.NCTestUtils;
35
import com.bc.fiduceo.TestUtil;
46
import com.bc.fiduceo.core.SatelliteObservation;
57
import com.bc.fiduceo.core.Sensor;
68
import com.bc.fiduceo.core.UseCaseConfig;
79
import com.bc.fiduceo.db.DbAndIOTestRunner;
10+
import com.bc.fiduceo.util.NetCDFUtils;
811
import org.apache.commons.cli.ParseException;
9-
import org.junit.Ignore;
1012
import org.junit.Test;
1113
import org.junit.runner.RunWith;
1214
import ucar.ma2.InvalidRangeException;
15+
import ucar.nc2.NetcdfFile;
1316

1417
import java.io.File;
1518
import java.io.IOException;
1619
import java.sql.SQLException;
1720
import java.util.ArrayList;
1821
import java.util.List;
1922

23+
import static org.junit.Assert.assertEquals;
24+
import static org.junit.Assert.assertTrue;
25+
2026
@RunWith(DbAndIOTestRunner.class)
2127
public class MatchupToolIntegrationTest_SMOSL1_tao_sss extends AbstractUsecaseIntegrationTest {
2228

2329
@Test
24-
@Ignore
2530
public void testMatchup_SMOS_TAO() throws IOException, SQLException, ParseException, InvalidRangeException {
2631
final UseCaseConfig useCaseConfig = createUseCaseConfigBuilder()
27-
.withTimeDeltaSeconds(28800, null)
32+
.withTimeDeltaSeconds(7220, null)
2833
.withMaxPixelDistanceKm(10, null)
2934
.createConfig();
3035
final File useCaseConfigFile = storeUseCaseConfig(useCaseConfig, "usecase-45.xml");
@@ -35,48 +40,51 @@ public void testMatchup_SMOS_TAO() throws IOException, SQLException, ParseExcept
3540
final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-u", useCaseConfigFile.getName(), "-start", "2016-156", "-end", "2016-156"};
3641
MatchupToolMain.main(args);
3742

38-
/*
43+
3944
final File mmdFile = getMmdFilePath(useCaseConfig, "2016-156", "2016-156");
4045
assertTrue(mmdFile.isFile());
4146
try (NetcdfFile mmd = NetcdfFile.open(mmdFile.getAbsolutePath())) {
4247
final int matchupCount = NetCDFUtils.getDimensionLength(FiduceoConstants.MATCHUP_COUNT, mmd);
43-
assertEquals(2, matchupCount);
44-
45-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_AMSR2_10.7GHzV", 0, 0, 0, 267.39f, mmd);
46-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_AMSR2_Earth-Azimuth", 0, 0, 1, -174.65f, mmd);
47-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_ASCAT_latitude", 0, 0, 0, 79.45f, mmd);
48-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_ASCAT_time", 0, 0, 1, 1465041600, mmd);
49-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_ERA_istl1", 0, 0, 0, 273.16f, mmd);
50-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_ERA_tcwv", 0, 0, 1, 8.0443f, mmd);
51-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_QSCAT_longitude", 0, 0, 0, 174.50399780273438, mmd);
52-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_QSCAT_std_inner", 0, 0, 1, 9.969209968386869E36, mmd);
53-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_SMAP_RMSE_v", 0, 0, 0, 3.927370071411133, mmd);
54-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_SMAP_nmp", 0, 0, 1, 19, mmd);
55-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_SMOS_Tbh", 0, 0, 0, 236.36058044433594, mmd);
56-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_SMOS_longitude", 0, 0, 1, 147.529f, mmd);
57-
NCTestUtils.assert3DVariable("DTUSIC1-sic-cci_areachange", 0, 0, 0, 0.998f, mmd);
58-
59-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Azimuth_Angle_125", 0, 0, 0, 9549, mmd);
60-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_BT_3_075", 1, 0, 1, 1158, mmd);
61-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_BT_4_125", 2, 0, 0, -32768, mmd);
62-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_BT_H_400", 0, 1, 1, 7770, mmd);
63-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Days_125", 1, 1, 0, 5999, mmd);
64-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Eta_275", 2, 1, 1, -4723, mmd);
65-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Footprint_Axis2_075", 0, 2, 0, -22329, mmd);
66-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Incidence_Angle_375", 1, 2, 1, -5369, mmd);
67-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Nb_RFI_Flags_400", 2, 2, 0, 0, mmd);
68-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Nviews_525", 0, 0, 1, 16, mmd);
69-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Pixel_BT_Standard_Deviation_H_025", 1, 0, 0, -32768, mmd);
70-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Pixel_BT_Standard_Deviation_V_475", 2, 0, 1, -30921, mmd);
71-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Pixel_Radiometric_Accuracy_4_625", 0, 1, 0, -32768, mmd);
72-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_UTC_Microseconds_375", 1, 1, 0, 44459, mmd);
73-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Xi_375", 2, 1, 1, 1525, mmd);
74-
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_lon", 0, 2, 0, 174.1642608642578, mmd);
48+
assertEquals(4, matchupCount);
49+
50+
NCTestUtils.assert3DVariable("tao-sss_AIRT", 0, 0, 0, 25.8f, mmd);
51+
NCTestUtils.assert3DVariable("tao-sss_BARO", 0, 0, 1, -9.9f, mmd);
52+
NCTestUtils.assertStringVariable("tao-sss_M", 8, 2, "DDDDDDDD", mmd);
53+
NCTestUtils.assert3DVariable("tao-sss_Q", 0, 0, 3, 11111199, mmd);
54+
NCTestUtils.assert3DVariable("tao-sss_RAIN", 0, 0, 0, -9.99f, mmd);
55+
NCTestUtils.assert3DVariable("tao-sss_RH", 0, 0, 1, 87.33f, mmd);
56+
NCTestUtils.assert3DVariable("tao-sss_SSS", 0, 0, 2, 35.49f, mmd);
57+
NCTestUtils.assert3DVariable("tao-sss_SST", 0, 0, 3, 26.438f, mmd);
58+
NCTestUtils.assert3DVariable("tao-sss_WDIR", 0, 0, 0, 257.f, mmd);
59+
NCTestUtils.assert3DVariable("tao-sss_WSPD", 0, 0, 1, 4.7f, mmd);
60+
NCTestUtils.assert3DVariable("tao-sss_acquisition_time", 0, 0, 2, 1465056000, mmd);
61+
NCTestUtils.assertStringVariable("tao-sss_file_name", 128, 3, "TAO_T2S140W_DM167A-20160228_2016-06.txt", mmd);
62+
NCTestUtils.assert3DVariable("tao-sss_latitude", 0, 0, 0, -2.04f, mmd);
63+
NCTestUtils.assert3DVariable("tao-sss_longitude", 0, 0, 1, -139.99f, mmd);
64+
NCTestUtils.assertStringVariable("tao-sss_processing_version", 30, 2, "v1", mmd);
65+
NCTestUtils.assert3DVariable("tao-sss_time", 0, 0, 3, 1465059600, mmd);
66+
NCTestUtils.assertVectorVariable("tao-sss_x", 0, 0, mmd);
67+
NCTestUtils.assertVectorVariable("tao-sss_y", 1, 87, mmd);
68+
69+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Azimuth_Angle_175", 0, 0, 0, -32768, mmd);
70+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_BT_3_125", 1, 0, 1, -32768, mmd);
71+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_BT_4_175", 2, 0, 3, -32768, mmd);
72+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_BT_H_425", 0, 1, 3, -19819, mmd);
73+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Days_175", 1, 1, 0, -2147483647, mmd);
74+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Eta_325", 2, 1, 1, -32768, mmd);
75+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Footprint_Axis2_125", 0, 2, 2, -32768, mmd);
76+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Incidence_Angle_400", 1, 2, 3, -3629, mmd);
77+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Nb_RFI_Flags_425", 2, 2, 0, 0, mmd);
78+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Nviews_575", 0, 0, 1, -32768, mmd);
79+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Pixel_BT_Standard_Deviation_H_075", 1, 0, 2, -32768, mmd);
80+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Pixel_BT_Standard_Deviation_V_525", 2, 0, 3, -32768, mmd);
81+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Pixel_Radiometric_Accuracy_H_025", 0, 1, 0, -32768, mmd);
82+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_UTC_Microseconds_400", 1, 1, 0, 289244, mmd);
83+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_Xi_400", 2, 1, 2, 15486, mmd);
84+
NCTestUtils.assert3DVariable("miras-smos-CDF3TA_lon", 0, 2, 3, -140.18731689453125, mmd);
7585
}
76-
*/
7786
}
7887

79-
8088
private void insert_TAO_SSS() throws IOException, SQLException {
8189
final String sensorKey = "tao-sss";
8290
final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{"insitu", sensorKey, "v1", "2016", "06", "TAO_T2S140W_DM167A-20160228_2016-06.txt"}, true);

0 commit comments

Comments
 (0)