Expand test coverage

openscm · Feb 9, 2019 · 3685de1 · 3685de1
1 parent 81d8bfe
commit 3685de1
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/tests/unit/test_core.py b/tests/unit/test_core.py
@@ -216,25 +216,41 @@ def test_timeseries_parameter_view(core, start_time, series):
 
 
 def test_timeseries_parameter_view_aggregation(core, start_time):
-    fossil_emms = np.array([0, 1, 2])
+    fossil_industry_emms = np.array([0, 1, 2])
+    fossil_energy_emms = np.array([2, 1, 4])
     land_emms = np.array([0.05, 0.1, 0.2])
 
     parameterset = core.parameters
 
-    fossil_writable = parameterset.get_writable_timeseries_view(
-        ("Emissions", "CO2", "Fossil"), ("World"), "GtC/yr", start_time, 24 * 3600
+    fossil_industry_writable = parameterset.get_writable_timeseries_view(
+        ("Emissions", "CO2", "Fossil", "Industry"), ("World"), "GtC/yr", start_time, 24 * 3600
+    )
+    fossil_industry_writable.set_series(fossil_industry_emms)
+
+    fossil_energy_writable = parameterset.get_writable_timeseries_view(
+        ("Emissions", "CO2", "Fossil", "Energy"), ("World"), "GtC/yr", start_time, 24 * 3600
     )
-    fossil_writable.set_series(fossil_emms)
+    fossil_energy_writable.set_series(fossil_energy_emms)
 
     land_writable = parameterset.get_writable_timeseries_view(
         ("Emissions", "CO2", "Land"), ("World"), "GtC/yr", start_time, 24 * 3600
     )
     land_writable.set_series(land_emms)
 
+    fossil_industry = parameterset.get_timeseries_view(
+        ("Emissions", "CO2", "Fossil", "Industry"), ("World"), "GtC/yr", start_time, 24 * 3600
+    )
+    np.testing.assert_allclose(fossil_industry.get_series(), fossil_industry_emms)
+
+    fossil_energy = parameterset.get_timeseries_view(
+        ("Emissions", "CO2", "Fossil", "Energy"), ("World"), "GtC/yr", start_time, 24 * 3600
+    )
+    np.testing.assert_allclose(fossil_energy.get_series(), fossil_energy_emms)
+
     fossil = parameterset.get_timeseries_view(
         ("Emissions", "CO2", "Fossil"), ("World"), "GtC/yr", start_time, 24 * 3600
     )
-    np.testing.assert_allclose(fossil.get_series(), fossil_emms)
+    np.testing.assert_allclose(fossil.get_series(), fossil_industry_emms + fossil_energy_emms)
 
     land = parameterset.get_timeseries_view(
         ("Emissions", "CO2", "Land"), ("World"), "GtC/yr", start_time, 24 * 3600
@@ -249,4 +265,4 @@ def test_timeseries_parameter_view_aggregation(core, start_time):
     total = parameterset.get_timeseries_view(
         ("Emissions", "CO2"), ("World"), "GtC/yr", start_time, 24 * 3600
     )
-    np.testing.assert_allclose(total.get_series(), land_emms + fossil_emms)
+    np.testing.assert_allclose(total.get_series(), land_emms + fossil_energy_emms + fossil_industry_emms)