From 4504b8812f88cd0a75eaf45da7fbb602e9e5d489 Mon Sep 17 00:00:00 2001
From: Steinar Foss <steinar@unicus.no>
Date: Fri, 13 Sep 2019 15:07:43 +0200
Subject: [PATCH] test_state2. added function test_jfunc.

---
 python/tests/test_state.py  | 90 +------------------------------------
 python/tests/test_state2.py | 48 +++++++++++++++++++-
 2 files changed, 48 insertions(+), 90 deletions(-)

diff --git a/python/tests/test_state.py b/python/tests/test_state.py
index c75af68db..773364e58 100644
--- a/python/tests/test_state.py
+++ b/python/tests/test_state.py
@@ -2,50 +2,7 @@ import unittest
 import opm.io
 
 class TestState(unittest.TestCase):
-    FAULTS_DECK = """
-RUNSPEC
 
-DIMENS
- 10 10 10 /
-GRID
-DX
-1000*0.25 /
-DY
-1000*0.25 /
-DZ
-1000*0.25 /
-TOPS
-100*0.25 /
-FAULTS
-  'F1'  1  1  1  4   1  4  'X' /
-  'F2'  5  5  1  4   1  4  'X-' /
-/
-MULTFLT
-  'F1' 0.50 /
-  'F2' 0.50 /
-/
-EDIT
-MULTFLT /
-  'F2' 0.25 /
-/
-OIL
-
-GAS
-
-TITLE
-The title
-
-START
-8 MAR 1998 /
-
-PROPS
-REGIONS
-SWAT
-1000*1 /
-SATNUM
-1000*2 /
-\
-"""
     """
     @classmethod
     def setUpClass(cls):
@@ -61,53 +18,8 @@ SATNUM
         self.assertTrue('WOPR' in smry) # hasKeyword
         self.assertFalse('NONO' in smry) # hasKeyword
     
-
-    def test_jfunc(self):
-        # jf["FLAG"]         = WATER; # set in deck
-        # jf["DIRECTION"]    = XY;    # default
-        # jf["ALPHA_FACTOR"] = 0.5    # default
-        # jf["BETA_FACTOR"]  = 0.5    # default
-        # jf["OIL_WATER"]    = 21.0   # set in deck
-        # jf["GAS_OIL"]      = -1.0   # N/A
-
-        js = opm.io.parse('tests/data/JFUNC.DATA').state
-        self.assertEqual('JFUNC TEST', js.title)
-        jf = js.jfunc()
-        print(jf)
-        self.assertEqual(jf['FLAG'], 'WATER')
-        self.assertEqual(jf['DIRECTION'], 'XY')
-        self.assertFalse('GAS_OIL' in jf)
-        self.assertTrue('OIL_WATER' in jf)
-        self.assertEqual(jf['OIL_WATER'], 21.0)
-        self.assertEqual(jf["ALPHA_FACTOR"], 0.5) # default
-        self.assertEqual(jf["BETA_FACTOR"],  0.5) # default
-
-        jfunc_gas = ###RUNSPEC
-DIMENS
- 10 10 10 /
-GRID
-DX
-1000*0.25 /
-DY
-1000*0.25 /
-DZ
-1000*0.25 /
-TOPS
-100*0.25 /
-JFUNC
-  GAS * 13.0 0.6 0.7 Z /
-PROPS\nREGIONS
-###
-        js_gas = opm.io.parse_string(jfunc_gas).state
-        jf = js_gas.jfunc()
-        self.assertEqual(jf['FLAG'], 'GAS')
-        self.assertEqual(jf['DIRECTION'], 'Z')
-        self.assertTrue('GAS_OIL' in jf)
-        self.assertFalse('OIL_WATER' in jf)
-        self.assertEqual(jf['GAS_OIL'], 13.0)
-        self.assertEqual(jf["ALPHA_FACTOR"], 0.6) # default
-        self.assertEqual(jf["BETA_FACTOR"],  0.7) # default
     """
 
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/python/tests/test_state2.py b/python/tests/test_state2.py
index 3e0ddd3e0..f77d2ef84 100644
--- a/python/tests/test_state2.py
+++ b/python/tests/test_state2.py
@@ -103,7 +103,6 @@ SATNUM
 
     def test_faults(self):
         self.assertEquals([], self.state.faultNames())
-        #self.assertEquals({}, self.state.faults())
         parser = Parser()
         faultdeck = parser.parse_string(self.FAULTS_DECK)
         faultstate = EclipseState(faultdeck)
@@ -113,5 +112,52 @@ SATNUM
         self.assertTrue((4,0,0,'X-') in f2)
         self.assertFalse((3,0,0,'X-') in f2)
 
+    def test_jfunc(self):
+        # jf["FLAG"]         = WATER; # set in deck
+        # jf["DIRECTION"]    = XY;    # default
+        # jf["ALPHA_FACTOR"] = 0.5    # default
+        # jf["BETA_FACTOR"]  = 0.5    # default
+        # jf["OIL_WATER"]    = 21.0   # set in deck
+        # jf["GAS_OIL"]      = -1.0   # N/A
 
+        parser = Parser()
+        deck = parser.parse('tests/data/JFUNC.DATA')
+        js = EclipseState(deck)
+        self.assertEqual('JFUNC TEST', js.title)
+        jf = js.jfunc()
+        print(jf)
+        self.assertEqual(jf['FLAG'], 'WATER')
+        self.assertEqual(jf['DIRECTION'], 'XY')
+        self.assertFalse('GAS_OIL' in jf)
+        self.assertTrue('OIL_WATER' in jf)
+        self.assertEqual(jf['OIL_WATER'], 21.0)
+        self.assertEqual(jf["ALPHA_FACTOR"], 0.5) # default
+        self.assertEqual(jf["BETA_FACTOR"],  0.5) # default
+
+        jfunc_gas = """
+DIMENS
+ 10 10 10 /
+GRID
+DX
+1000*0.25 /
+DY
+1000*0.25 /
+DZ
+1000*0.25 /
+TOPS
+100*0.25 /
+JFUNC
+  GAS * 13.0 0.6 0.7 Z /
+PROPS\nREGIONS
+"""
+        deck2 = parser.parse_string(jfunc_gas)
+        js_gas = EclipseState(deck2)
+        jf = js_gas.jfunc()
+        self.assertEqual(jf['FLAG'], 'GAS')
+        self.assertEqual(jf['DIRECTION'], 'Z')
+        self.assertTrue('GAS_OIL' in jf)
+        self.assertFalse('OIL_WATER' in jf)
+        self.assertEqual(jf['GAS_OIL'], 13.0)
+        self.assertEqual(jf["ALPHA_FACTOR"], 0.6) # default
+        self.assertEqual(jf["BETA_FACTOR"],  0.7) # default