corrected argosurf reg-ex

Author: TomBlock

core/src/main/java/com/bc/fiduceo/reader/insitu/sirds_sst/SirdsInsituReader.java

@@ -264,9 +264,7 @@ static String toRegExPart(String sensorKey) {
         int splitIdx = sensorKey.lastIndexOf("-");
 
         final String sensor = sensorKey.substring(0, splitIdx);
-        if (sensor.equals("argosurf")) {
-            return "argo_surf";
-        } else if (sensor.equals("driftercmems")) {
+        if (sensor.equals("driftercmems")) {
             return "drifter_cmems";
         } else {
             return sensor;

core/src/test/java/com/bc/fiduceo/reader/insitu/sirds_sst/SirdsInsituReaderTest.java

@@ -33,12 +33,12 @@ public void testGetRegEx_mooring() {
     @Test
     public void testGetRegEx_argosurf() {
         final SirdsInsituReader insituReader = new SirdsInsituReader("argosurf-sirds");
-        final String expected = "SSTCCI2_refdata_argo_surf_\\d{6}.nc";
+        final String expected = "SSTCCI2_refdata_argosurf_\\d{6}.nc";
 
         assertEquals(expected, insituReader.getRegEx());
         final Pattern pattern = java.util.regex.Pattern.compile(expected);
 
-        Matcher matcher = pattern.matcher("SSTCCI2_refdata_argo_surf_202005.nc");
+        Matcher matcher = pattern.matcher("SSTCCI2_refdata_argosurf_202005.nc");
         assertTrue(matcher.matches());
 
         matcher = pattern.matcher("SSTCCI2_refdata_bottle_198904.nc");
@@ -85,7 +85,7 @@ public void testExtractYearMonthDayFromFilename() {
     @Test
     public void testToRegExPart() {
         assertEquals("argo", SirdsInsituReader.toRegExPart("argo-sirds"));
-        assertEquals("argo_surf", SirdsInsituReader.toRegExPart("argosurf-sirds"));
+        assertEquals("argosurf", SirdsInsituReader.toRegExPart("argosurf-sirds"));
         assertEquals("drifter", SirdsInsituReader.toRegExPart("drifter-sirds"));
         assertEquals("drifter_cmems", SirdsInsituReader.toRegExPart("driftercmems-sirds"));
     }