Merge pull request openscm#6 from znicholls/ciceroscm-zn

Test output units
znicholls · Apr 22, 2021 · 3da7eba · 3da7eba
2 parents 53ec5eb + a3e65b9
commit 3da7eba
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/tests/integration/test_ciceroSCM.py b/tests/integration/test_ciceroSCM.py
@@ -100,32 +100,11 @@ def test_run(
         quantiles = calculate_quantiles(res, [0, 0.05, 0.17, 0.5, 0.83, 0.95, 1])
         assert "run_id" not in quantiles.meta
 
+        assert res.filter(variable="Atmospheric Concentrations|CO2").get_unique_meta("unit", True) == "ppm"
+        assert res.filter(variable="Emissions|CO2").get_unique_meta("unit", True) == "PgC / yr"
+
         self._check_output(res, expected_output_file, update_expected_values)
 
-        # to add into the json file
-
-        # [
-        #     {
-        #         "variable": "Atmospheric Concentrations|CO2",
-        #         "unit": "ppm",
-        #         "region": "World",
-        #         "year": 2100,
-        #         "scenario": "ssp370",
-        #         "quantile": 1
-        #     },
-        #     2400.88
-        # ],
-        # [
-        #     {
-        #         "variable": "Emissions|CO2",
-        #         "unit": "Pg/C",
-        #         "region": "World",
-        #         "year": 2100,
-        #         "scenario": "ssp370",
-        #         "quantile": 1
-        #     },
-        #     2400.88
-        # ],
 
     @pytest.mark.ciceroscm
     def test_variable_naming(self, test_scenarios):

diff --git a/tests/test-data/expected-integration-output/expected_ciceroscm_test_run_output.json b/tests/test-data/expected-integration-output/expected_ciceroscm_test_run_output.json
@@ -151,6 +151,28 @@
                 "quantile": 0.95
             },
             3.6048250000000004
+        ],
+        [
+            {
+                "variable": "Atmospheric Concentrations|CO2",
+                "region": "World",
+                "year": 2100,
+                "scenario": "ssp370",
+                "unit": "ppm",
+                "quantile": 1
+            },
+            240
+        ],
+        [
+            {
+                "variable": "Emissions|CO2",
+                "region": "World",
+                "year": 2100,
+                "scenario": "ssp370",
+                "unit": "Pg/C",
+                "quantile": 1
+            },
+            2400.88
         ]
     ]
-}
+}