added integration tests, fixed bugs

Author: TomBlock

core/src/main/java/com/bc/fiduceo/reader/insitu/ndbc/NdbcSMReaderPlugin.java

@@ -11,7 +11,7 @@ public class NdbcSMReaderPlugin implements ReaderPlugin {
 
     @Override
     public Reader createReader(ReaderContext readerContext) {
-        return new NdbcCWReader();
+        return new NdbcSMReader();
     }
 
     @Override

core/src/main/resources/META-INF/services/com.bc.fiduceo.reader.ReaderPlugin

@@ -38,4 +38,6 @@ com.bc.fiduceo.reader.smos.SmosL1CDailyGriddedReaderPlugin
 com.bc.fiduceo.reader.insitu.sic_cci.ANTXXXISicInsituReaderPlugin
 com.bc.fiduceo.reader.insitu.sic_cci.DMISIC0SicInsituReaderPlugin
 com.bc.fiduceo.reader.insitu.sic_cci.DTUSIC1SicInsituReaderPlugin
-com.bc.fiduceo.reader.windsat.WindsatReaderPlugin
+com.bc.fiduceo.reader.windsat.WindsatReaderPlugin
+com.bc.fiduceo.reader.insitu.ndbc.NdbcCWReaderPlugin
+com.bc.fiduceo.reader.insitu.ndbc.NdbcSMReaderPlugin

core/src/test/java/com/bc/fiduceo/TestUtil.java

@@ -158,6 +158,9 @@ public static void writeSystemConfig(File configDir, File archiveRoot) throws IO
                 "        <rule sensors = \"ANTXXXI-sic-cci, DMISIC0-sic-cci, DTUSIC1-sic-cci\">" +
                 "            insitu/sic-cci/SENSOR/VERSION" +
                 "        </rule>" +
+                "        <rule sensors=\"ndbc-sm-cb\">\n" +
+                "            insitu/ndbc/SENSOR/VERSION/YEAR\n" +
+                "        </rule>" +
                 "    </archive>" +
                 "    <temp-directory>" +
                 "            " + TestUtil.getTestDir().getAbsolutePath() +

core/src/test/java/com/bc/fiduceo/reader/insitu/ndbc/NdbcSMReaderPluginTest.java

@@ -34,6 +34,6 @@ public void testGetDataType() {
     public void testCreateReader() {
         final Reader reader = plugin.createReader(null);
         assertNotNull(reader);
-        assertTrue(reader instanceof NdbcCWReader);
+        assertTrue(reader instanceof NdbcSMReader);
     }
 }

core/src/test/java/com/bc/fiduceo/reader/insitu/ndbc/NdbcSMReaderTest.java

@@ -39,6 +39,9 @@ public void testGetRegEx() {
         matcher = pattern.matcher("46005h2018.txt");
         assertTrue(matcher.matches());
 
+        matcher = pattern.matcher("42088h2017.txt");
+        assertTrue(matcher.matches());
+
         matcher = pattern.matcher("41048c2016.txt");
         assertFalse(matcher.matches());