You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by fg...@apache.org on 2018/01/23 16:44:16 UTC
[19/32] incubator-sdap-ningester git commit: consistent test names
consistent test names
Project: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/commit/53af516b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/tree/53af516b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/diff/53af516b
Branch: refs/heads/master
Commit: 53af516bff19d6d2fba7af09f76e12392b624fdc
Parents: 84df3ea
Author: Frank Greguska <fr...@jpl.nasa.gov>
Authored: Thu Jan 4 17:33:15 2018 -0800
Committer: Frank Greguska <fr...@jpl.nasa.gov>
Committed: Thu Jan 4 17:33:15 2018 -0800
----------------------------------------------------------------------
.../processors/AddDatasetNameTest.java | 31 ++++++++
.../processors/AddDayOfYearAttributeTest.java | 83 ++++++++++++++++++++
.../processors/AddTimeFromGranuleNameTest.java | 82 +++++++++++++++++++
.../processors/GenerateTileIdTest.java | 64 +++++++++++++++
.../processors/TestAddDatasetName.java | 31 --------
.../processors/TestAddDayOfYearAttribute.java | 83 --------------------
.../processors/TestAddTimeFromGranuleName.java | 82 -------------------
.../processors/TestGenerateTileId.java | 64 ---------------
.../nexus/ningester/writer/SolrStoreTest.java | 67 ++++++++++++++++
.../nexus/ningester/writer/TestSolrStore.java | 67 ----------------
10 files changed, 327 insertions(+), 327 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetNameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetNameTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetNameTest.java
new file mode 100644
index 0000000..42d594c
--- /dev/null
+++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetNameTest.java
@@ -0,0 +1,31 @@
+/*
+ ******************************************************************************
+ * Copyright (c) 2018 Jet Propulsion Laboratory,
+ * California Institute of Technology. All rights reserved
+ *****************************************************************************/
+
+package gov.nasa.jpl.nexus.ningester.processors;
+
+import org.junit.Test;
+import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class AddDatasetNameTest {
+
+ @Test
+ public void testDatasetName() {
+
+ String datasetName = "testDataset";
+
+ NexusContent.NexusTile input = NexusContent.NexusTile.newBuilder().build();
+
+ AddDatasetName processor = new AddDatasetName(datasetName);
+
+ NexusContent.NexusTile result = processor.addDatasetName(input);
+
+ assertThat(result.getSummary().getDatasetName(), is(datasetName));
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttributeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttributeTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttributeTest.java
new file mode 100644
index 0000000..13137a2
--- /dev/null
+++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttributeTest.java
@@ -0,0 +1,83 @@
+/*****************************************************************************
+ * Copyright (c) 2018 Jet Propulsion Laboratory,
+ * California Institute of Technology. All rights reserved
+ *****************************************************************************/
+
+package gov.nasa.jpl.nexus.ningester.processors;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.beans.HasPropertyWithValue.hasProperty;
+
+public class AddDayOfYearAttributeTest {
+
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ @Test
+ public void testSuccessfulMatch() {
+ String regex = "^(\\d{3})";
+ String granuleName = "001.L4_5day_avhrr_clim_sst_pixelMean.nc";
+ NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
+ NexusContent.TileSummary.newBuilder()
+ .setGranule(granuleName)
+ .build()
+ ).build();
+
+ AddDayOfYearAttribute processor = new AddDayOfYearAttribute(regex);
+
+ NexusContent.NexusTile result = processor.setDayOfYearFromGranuleName(nexusTile);
+
+ assertThat(result.getSummary().getGlobalAttributesList(), contains(
+ hasProperty("name", is("day_of_year_i"))
+ ));
+
+ String actualDayOfYear = result.getSummary().getGlobalAttributes(0).getValues(0);
+ assertThat(actualDayOfYear, is("001"));
+ }
+
+ @Test()
+ public void testUnsuccessfulMatch() {
+
+ thrown.expect(RuntimeException.class);
+ thrown.expectMessage("regex did not match granuleName.");
+
+ String regex = "^(\\d{3})";
+ String granuleName = "L4_5day_avhrr_clim_sst_pixelMean.nc";
+ NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
+ NexusContent.TileSummary.newBuilder()
+ .setGranule(granuleName)
+ .build()
+ ).build();
+
+ AddDayOfYearAttribute processor = new AddDayOfYearAttribute(regex);
+
+ processor.setDayOfYearFromGranuleName(nexusTile);
+ }
+
+ @Test()
+ public void testUnsuccessfulGroupMatch() {
+
+ thrown.expect(RuntimeException.class);
+ thrown.expectMessage("regex does not have exactly one capturing group.");
+
+ String regex = "^\\d{3}";
+ String granuleName = "001.L4_5day_avhrr_clim_sst_pixelMean.nc";
+ NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
+ NexusContent.TileSummary.newBuilder()
+ .setGranule(granuleName)
+ .build()
+ ).build();
+
+ AddDayOfYearAttribute processor = new AddDayOfYearAttribute(regex);
+
+ processor.setDayOfYearFromGranuleName(nexusTile);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleNameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleNameTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleNameTest.java
new file mode 100644
index 0000000..ab8d214
--- /dev/null
+++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleNameTest.java
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * Copyright (c) 2018 Jet Propulsion Laboratory,
+ * California Institute of Technology. All rights reserved
+ *****************************************************************************/
+package gov.nasa.jpl.nexus.ningester.processors;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
+
+import java.text.ParseException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.isA;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+public class AddTimeFromGranuleNameTest {
+
+
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ @Test
+ public void testSuccessfulMatch() {
+ String regex = "^.*(\\d{7})\\.";
+ String dateFormat = "yyyyDDD";
+
+ String granuleName = "A2012001.L3m_DAY_NSST_sst_4km.nc";
+ Long expectedTime = 1325376000L; // 01/01/2012 00:00:00 in epoch time
+ NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
+ NexusContent.TileSummary.newBuilder()
+ .setGranule(granuleName)
+ .build()
+ ).setTile(
+ NexusContent.TileData.newBuilder()
+ .setGridTile(
+ NexusContent.GridTile.newBuilder(
+
+ ).build()
+ ).build()
+ ).build();
+
+ AddTimeFromGranuleName processor = new AddTimeFromGranuleName(regex, dateFormat);
+
+ NexusContent.NexusTile result = processor.setTimeFromGranuleName(nexusTile);
+
+ assertThat(result.getTile().getGridTile().getTime(), is(expectedTime));
+ assertThat(result.getSummary().getStats().getMinTime(), is(expectedTime));
+ assertThat(result.getSummary().getStats().getMaxTime(), is(expectedTime));
+ }
+
+ @Test
+ public void testUnparseable() {
+ String regex = "^.*(\\d{7})\\.";
+ String dateFormat = "yyyyDDDss";
+
+ String granuleName = "A2012001.L3m_DAY_NSST_sst_4km.nc";
+
+ thrown.expect(RuntimeException.class);
+ thrown.expectCause(isA(ParseException.class));
+
+ NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
+ NexusContent.TileSummary.newBuilder()
+ .setGranule(granuleName)
+ .build()
+ ).setTile(
+ NexusContent.TileData.newBuilder()
+ .setGridTile(
+ NexusContent.GridTile.newBuilder(
+
+ ).build()
+ ).build()
+ ).build();
+
+ AddTimeFromGranuleName processor = new AddTimeFromGranuleName(regex, dateFormat);
+
+ NexusContent.NexusTile result = processor.setTimeFromGranuleName(nexusTile);
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileIdTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileIdTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileIdTest.java
new file mode 100644
index 0000000..7516012
--- /dev/null
+++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileIdTest.java
@@ -0,0 +1,64 @@
+/*****************************************************************************
+ * Copyright (c) 2018 Jet Propulsion Laboratory,
+ * California Institute of Technology. All rights reserved
+ *****************************************************************************/
+
+package gov.nasa.jpl.nexus.ningester.processors;
+
+import org.junit.Test;
+import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class GenerateTileIdTest {
+
+
+ @Test
+ public void testGenerateId() {
+
+ String granuleFileName = "file:/path/to/some/file/19960421120000-NCEI-L4_GHRSST-SSTblend-AVHRR_OI-GLOB-v02.0-fv02.0.nc";
+ String sectionSpec = "time:0:1,lat:140:160,lon:640:680";
+
+ String expectedId = "c031a9c4-9e1d-32e9-9d5c-d2497ce74920";
+
+ NexusContent.NexusTile.Builder inputTileBuilder = NexusContent.NexusTile.newBuilder();
+ inputTileBuilder.getSummaryBuilder().setGranule(granuleFileName);
+ inputTileBuilder.getSummaryBuilder().setSectionSpec(sectionSpec);
+ inputTileBuilder.setTile(NexusContent.TileData.newBuilder());
+
+ GenerateTileId processor = new GenerateTileId();
+
+ NexusContent.NexusTile result = processor.addTileId(inputTileBuilder.build());
+
+ assertThat(result.getSummary().getTileId(), is(expectedId));
+ assertThat(result.getTile().getTileId(), is(expectedId));
+
+ }
+
+ @Test
+ public void testGenerateIdWithSalt() {
+
+ String granuleFileName = "file:/path/to/some/file/CCMP_Wind_Analysis_19990928_V02.0_L3.0_RSS.nc";
+ String sectionSpec = "time:3:4,longitude:174:261,latitude:152:190";
+ String salt = "wind_u";
+
+ String expectedId = "48da50ef-e92c-3562-89f9-470561a06482";
+
+ NexusContent.NexusTile.Builder inputTileBuilder = NexusContent.NexusTile.newBuilder();
+ inputTileBuilder.getSummaryBuilder().setGranule(granuleFileName);
+ inputTileBuilder.getSummaryBuilder().setSectionSpec(sectionSpec);
+ inputTileBuilder.setTile(NexusContent.TileData.newBuilder());
+
+ GenerateTileId processor = new GenerateTileId();
+ processor.setSalt(salt);
+
+ NexusContent.NexusTile result = processor.addTileId(inputTileBuilder.build());
+
+ assertThat(result.getSummary().getTileId(), is(expectedId));
+ assertThat(result.getTile().getTileId(), is(expectedId));
+
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddDatasetName.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddDatasetName.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddDatasetName.java
deleted file mode 100644
index 4bbde27..0000000
--- a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddDatasetName.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- ******************************************************************************
- * Copyright (c) 2018 Jet Propulsion Laboratory,
- * California Institute of Technology. All rights reserved
- *****************************************************************************/
-
-package gov.nasa.jpl.nexus.ningester.processors;
-
-import org.junit.Test;
-import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class TestAddDatasetName {
-
- @Test
- public void testDatasetName() {
-
- String datasetName = "testDataset";
-
- NexusContent.NexusTile input = NexusContent.NexusTile.newBuilder().build();
-
- AddDatasetName processor = new AddDatasetName(datasetName);
-
- NexusContent.NexusTile result = processor.addDatasetName(input);
-
- assertThat(result.getSummary().getDatasetName(), is(datasetName));
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddDayOfYearAttribute.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddDayOfYearAttribute.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddDayOfYearAttribute.java
deleted file mode 100644
index b1b398d..0000000
--- a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddDayOfYearAttribute.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2018 Jet Propulsion Laboratory,
- * California Institute of Technology. All rights reserved
- *****************************************************************************/
-
-package gov.nasa.jpl.nexus.ningester.processors;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.beans.HasPropertyWithValue.hasProperty;
-
-public class TestAddDayOfYearAttribute {
-
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
- @Test
- public void testSuccessfulMatch() {
- String regex = "^(\\d{3})";
- String granuleName = "001.L4_5day_avhrr_clim_sst_pixelMean.nc";
- NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
- NexusContent.TileSummary.newBuilder()
- .setGranule(granuleName)
- .build()
- ).build();
-
- AddDayOfYearAttribute processor = new AddDayOfYearAttribute(regex);
-
- NexusContent.NexusTile result = processor.setDayOfYearFromGranuleName(nexusTile);
-
- assertThat(result.getSummary().getGlobalAttributesList(), contains(
- hasProperty("name", is("day_of_year_i"))
- ));
-
- String actualDayOfYear = result.getSummary().getGlobalAttributes(0).getValues(0);
- assertThat(actualDayOfYear, is("001"));
- }
-
- @Test()
- public void testUnsuccessfulMatch() {
-
- thrown.expect(RuntimeException.class);
- thrown.expectMessage("regex did not match granuleName.");
-
- String regex = "^(\\d{3})";
- String granuleName = "L4_5day_avhrr_clim_sst_pixelMean.nc";
- NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
- NexusContent.TileSummary.newBuilder()
- .setGranule(granuleName)
- .build()
- ).build();
-
- AddDayOfYearAttribute processor = new AddDayOfYearAttribute(regex);
-
- processor.setDayOfYearFromGranuleName(nexusTile);
- }
-
- @Test()
- public void testUnsuccessfulGroupMatch() {
-
- thrown.expect(RuntimeException.class);
- thrown.expectMessage("regex does not have exactly one capturing group.");
-
- String regex = "^\\d{3}";
- String granuleName = "001.L4_5day_avhrr_clim_sst_pixelMean.nc";
- NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
- NexusContent.TileSummary.newBuilder()
- .setGranule(granuleName)
- .build()
- ).build();
-
- AddDayOfYearAttribute processor = new AddDayOfYearAttribute(regex);
-
- processor.setDayOfYearFromGranuleName(nexusTile);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddTimeFromGranuleName.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddTimeFromGranuleName.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddTimeFromGranuleName.java
deleted file mode 100644
index 161541b..0000000
--- a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestAddTimeFromGranuleName.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2018 Jet Propulsion Laboratory,
- * California Institute of Technology. All rights reserved
- *****************************************************************************/
-package gov.nasa.jpl.nexus.ningester.processors;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
-
-import java.text.ParseException;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.isA;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-
-public class TestAddTimeFromGranuleName {
-
-
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
- @Test
- public void testSuccessfulMatch() {
- String regex = "^.*(\\d{7})\\.";
- String dateFormat = "yyyyDDD";
-
- String granuleName = "A2012001.L3m_DAY_NSST_sst_4km.nc";
- Long expectedTime = 1325376000L; // 01/01/2012 00:00:00 in epoch time
- NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
- NexusContent.TileSummary.newBuilder()
- .setGranule(granuleName)
- .build()
- ).setTile(
- NexusContent.TileData.newBuilder()
- .setGridTile(
- NexusContent.GridTile.newBuilder(
-
- ).build()
- ).build()
- ).build();
-
- AddTimeFromGranuleName processor = new AddTimeFromGranuleName(regex, dateFormat);
-
- NexusContent.NexusTile result = processor.setTimeFromGranuleName(nexusTile);
-
- assertThat(result.getTile().getGridTile().getTime(), is(expectedTime));
- assertThat(result.getSummary().getStats().getMinTime(), is(expectedTime));
- assertThat(result.getSummary().getStats().getMaxTime(), is(expectedTime));
- }
-
- @Test
- public void testUnparseable() {
- String regex = "^.*(\\d{7})\\.";
- String dateFormat = "yyyyDDDss";
-
- String granuleName = "A2012001.L3m_DAY_NSST_sst_4km.nc";
-
- thrown.expect(RuntimeException.class);
- thrown.expectCause(isA(ParseException.class));
-
- NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary(
- NexusContent.TileSummary.newBuilder()
- .setGranule(granuleName)
- .build()
- ).setTile(
- NexusContent.TileData.newBuilder()
- .setGridTile(
- NexusContent.GridTile.newBuilder(
-
- ).build()
- ).build()
- ).build();
-
- AddTimeFromGranuleName processor = new AddTimeFromGranuleName(regex, dateFormat);
-
- NexusContent.NexusTile result = processor.setTimeFromGranuleName(nexusTile);
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestGenerateTileId.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestGenerateTileId.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestGenerateTileId.java
deleted file mode 100644
index ea18c3a..0000000
--- a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestGenerateTileId.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2018 Jet Propulsion Laboratory,
- * California Institute of Technology. All rights reserved
- *****************************************************************************/
-
-package gov.nasa.jpl.nexus.ningester.processors;
-
-import org.junit.Test;
-import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class TestGenerateTileId {
-
-
- @Test
- public void testGenerateId() {
-
- String granuleFileName = "file:/path/to/some/file/19960421120000-NCEI-L4_GHRSST-SSTblend-AVHRR_OI-GLOB-v02.0-fv02.0.nc";
- String sectionSpec = "time:0:1,lat:140:160,lon:640:680";
-
- String expectedId = "c031a9c4-9e1d-32e9-9d5c-d2497ce74920";
-
- NexusContent.NexusTile.Builder inputTileBuilder = NexusContent.NexusTile.newBuilder();
- inputTileBuilder.getSummaryBuilder().setGranule(granuleFileName);
- inputTileBuilder.getSummaryBuilder().setSectionSpec(sectionSpec);
- inputTileBuilder.setTile(NexusContent.TileData.newBuilder());
-
- GenerateTileId processor = new GenerateTileId();
-
- NexusContent.NexusTile result = processor.addTileId(inputTileBuilder.build());
-
- assertThat(result.getSummary().getTileId(), is(expectedId));
- assertThat(result.getTile().getTileId(), is(expectedId));
-
- }
-
- @Test
- public void testGenerateIdWithSalt() {
-
- String granuleFileName = "file:/path/to/some/file/CCMP_Wind_Analysis_19990928_V02.0_L3.0_RSS.nc";
- String sectionSpec = "time:3:4,longitude:174:261,latitude:152:190";
- String salt = "wind_u";
-
- String expectedId = "48da50ef-e92c-3562-89f9-470561a06482";
-
- NexusContent.NexusTile.Builder inputTileBuilder = NexusContent.NexusTile.newBuilder();
- inputTileBuilder.getSummaryBuilder().setGranule(granuleFileName);
- inputTileBuilder.getSummaryBuilder().setSectionSpec(sectionSpec);
- inputTileBuilder.setTile(NexusContent.TileData.newBuilder());
-
- GenerateTileId processor = new GenerateTileId();
- processor.setSalt(salt);
-
- NexusContent.NexusTile result = processor.addTileId(inputTileBuilder.build());
-
- assertThat(result.getSummary().getTileId(), is(expectedId));
- assertThat(result.getTile().getTileId(), is(expectedId));
-
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/writer/SolrStoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/writer/SolrStoreTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/writer/SolrStoreTest.java
new file mode 100644
index 0000000..a7fee32
--- /dev/null
+++ b/src/test/java/gov/nasa/jpl/nexus/ningester/writer/SolrStoreTest.java
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * Copyright (c) 2018 Jet Propulsion Laboratory,
+ * California Institute of Technology. All rights reserved
+ *****************************************************************************/
+
+package gov.nasa.jpl.nexus.ningester.writer;
+
+import org.apache.solr.common.SolrInputDocument;
+import org.junit.Test;
+import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
+import org.springframework.mock.env.MockEnvironment;
+
+import static org.junit.Assert.assertEquals;
+
+public class SolrStoreTest {
+
+ @Test
+ public void testGetSolrDocFromTileSummary() {
+ SolrStore solrStore = new SolrStore(null);
+ solrStore.setEnvironment(new MockEnvironment());
+
+ NexusContent.TileSummary tileSummary = NexusContent.TileSummary.newBuilder()
+ .setTileId("1")
+ .setBbox(NexusContent.TileSummary.BBox.newBuilder()
+ .setLatMin(51)
+ .setLatMax(55)
+ .setLonMin(22)
+ .setLonMax(30)
+ .build())
+ .setDatasetName("test")
+ .setDatasetUuid("4")
+ .setDataVarName("sst")
+ .setGranule("test.nc")
+ .setSectionSpec("0:1,0:1")
+ .setStats(NexusContent.TileSummary.DataStats.newBuilder()
+ .setCount(10)
+ .setMax(50)
+ .setMin(50)
+ .setMean(50)
+ .setMaxTime(1429142399)
+ .setMinTime(1429142399)
+ .build())
+ .build();
+
+ SolrInputDocument doc = solrStore.getSolrDocFromTileSummary(tileSummary);
+
+ assertEquals("2015-04-15T23:59:59Z", doc.get("tile_min_time_dt").getValue());
+ assertEquals("2015-04-15T23:59:59Z", doc.get("tile_max_time_dt").getValue());
+ assertEquals("sea_surface_temp", doc.get("table_s").getValue());
+ assertEquals("POLYGON((22.000 51.000, 30.000 51.000, 30.000 55.000, 22.000 55.000, 22.000 51.000))", doc.get("geo").getValue());
+ assertEquals("1", doc.get("id").getValue());
+ assertEquals("4", doc.get("dataset_id_s").getValue());
+ assertEquals("0:1,0:1", doc.get("sectionSpec_s").getValue());
+ assertEquals("test", doc.get("dataset_s").getValue());
+ assertEquals("test.nc", doc.get("granule_s").getValue());
+ assertEquals("sst", doc.get("tile_var_name_s").getValue());
+ assertEquals(22.0f, (Float) doc.get("tile_min_lon").getValue(), 0.01f);
+ assertEquals(30.0f, (Float) doc.get("tile_max_lon").getValue(), 0.01f);
+ assertEquals(51.0f, (Float) doc.get("tile_min_lat").getValue(), 0.01f);
+ assertEquals(55.0f, (Float) doc.get("tile_max_lat").getValue(), 0.01f);
+ assertEquals(50.0f, (Float) doc.get("tile_min_val_d").getValue(), 0.01f);
+ assertEquals(50.0f, (Float) doc.get("tile_max_val_d").getValue(), 0.01f);
+ assertEquals(50.0f, (Float) doc.get("tile_avg_val_d").getValue(), 0.01f);
+ assertEquals(10, doc.get("tile_count_i").getValue());
+ assertEquals("test!1", doc.get("solr_id_s").getValue());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/53af516b/src/test/java/gov/nasa/jpl/nexus/ningester/writer/TestSolrStore.java
----------------------------------------------------------------------
diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/writer/TestSolrStore.java b/src/test/java/gov/nasa/jpl/nexus/ningester/writer/TestSolrStore.java
deleted file mode 100644
index 0c72791..0000000
--- a/src/test/java/gov/nasa/jpl/nexus/ningester/writer/TestSolrStore.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2018 Jet Propulsion Laboratory,
- * California Institute of Technology. All rights reserved
- *****************************************************************************/
-
-package gov.nasa.jpl.nexus.ningester.writer;
-
-import org.apache.solr.common.SolrInputDocument;
-import org.junit.Test;
-import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent;
-import org.springframework.mock.env.MockEnvironment;
-
-import static org.junit.Assert.assertEquals;
-
-public class TestSolrStore {
-
- @Test
- public void testGetSolrDocFromTileSummary() {
- SolrStore solrStore = new SolrStore(null);
- solrStore.setEnvironment(new MockEnvironment());
-
- NexusContent.TileSummary tileSummary = NexusContent.TileSummary.newBuilder()
- .setTileId("1")
- .setBbox(NexusContent.TileSummary.BBox.newBuilder()
- .setLatMin(51)
- .setLatMax(55)
- .setLonMin(22)
- .setLonMax(30)
- .build())
- .setDatasetName("test")
- .setDatasetUuid("4")
- .setDataVarName("sst")
- .setGranule("test.nc")
- .setSectionSpec("0:1,0:1")
- .setStats(NexusContent.TileSummary.DataStats.newBuilder()
- .setCount(10)
- .setMax(50)
- .setMin(50)
- .setMean(50)
- .setMaxTime(1429142399)
- .setMinTime(1429142399)
- .build())
- .build();
-
- SolrInputDocument doc = solrStore.getSolrDocFromTileSummary(tileSummary);
-
- assertEquals("2015-04-15T23:59:59Z", doc.get("tile_min_time_dt").getValue());
- assertEquals("2015-04-15T23:59:59Z", doc.get("tile_max_time_dt").getValue());
- assertEquals("sea_surface_temp", doc.get("table_s").getValue());
- assertEquals("POLYGON((22.000 51.000, 30.000 51.000, 30.000 55.000, 22.000 55.000, 22.000 51.000))", doc.get("geo").getValue());
- assertEquals("1", doc.get("id").getValue());
- assertEquals("4", doc.get("dataset_id_s").getValue());
- assertEquals("0:1,0:1", doc.get("sectionSpec_s").getValue());
- assertEquals("test", doc.get("dataset_s").getValue());
- assertEquals("test.nc", doc.get("granule_s").getValue());
- assertEquals("sst", doc.get("tile_var_name_s").getValue());
- assertEquals(22.0f, (Float) doc.get("tile_min_lon").getValue(), 0.01f);
- assertEquals(30.0f, (Float) doc.get("tile_max_lon").getValue(), 0.01f);
- assertEquals(51.0f, (Float) doc.get("tile_min_lat").getValue(), 0.01f);
- assertEquals(55.0f, (Float) doc.get("tile_max_lat").getValue(), 0.01f);
- assertEquals(50.0f, (Float) doc.get("tile_min_val_d").getValue(), 0.01f);
- assertEquals(50.0f, (Float) doc.get("tile_max_val_d").getValue(), 0.01f);
- assertEquals(50.0f, (Float) doc.get("tile_avg_val_d").getValue(), 0.01f);
- assertEquals(10, doc.get("tile_count_i").getValue());
- assertEquals("test!1", doc.get("solr_id_s").getValue());
- }
-}