testing started

nismod · Feb 24, 2017 · ee9532b · ee9532b
1 parent f143d33
commit ee9532b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/energy_demand/main.py b/energy_demand/main.py
@@ -215,8 +215,8 @@ def energy_demand_model(data, pop_data_external):
 
     # Add electricity data to result dict for wrapper
     result_dict = mf.add_demand_result_dict(0, e_app_bd, data['fuel_type_lu'], reg_pop, timesteps, result_dict, data['timesteps_own_selection'])
-    print(result_dict[0][0])
-    prnt("..")
+    #print(result_dict[0][0])
+    #prnt("..")
     # Add gas data
     result_dict = mf.add_demand_result_dict(1, g_hd_bd, data['fuel_type_lu'], reg_pop, timesteps, result_dict, data['timesteps_own_selection'])
 

diff --git a/tests/test_skeleton.py b/tests/test_skeleton.py
@@ -2,16 +2,25 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from energy_demand.skeleton import fib
+import energy_demand.main_functions as mf
 
-__author__ = "Will Usher"
-__copyright__ = "Will Usher"
-__license__ = "mit"
 
+def test_conversion_ktoe_gwh():
 
+    # in test value
+    in_value = 10
+    expected = in_value * 11.6300000
+
+    # call function
+    out_value = mf.conversion_ktoe_gwh(in_value)
+
+    assert out_value == expected
+# ----
+'''
 def test_fib():
     assert fib(1) == 1
     assert fib(2) == 1
     assert fib(7) == 13
     with pytest.raises(AssertionError):
         fib(-10)
+'''