refactored test directory structure

Co-authored-by: eriksynn <[email protected]> Co-authored-by: Debajyoti Debnath <[email protected]> Co-authored-by: Jonathan Kwan <[email protected]> Co-authored-by: thatoldplatitude <[email protected]>
codeforboston · May 22, 2024 · adf4b28 · adf4b28
1 parent b2b533c
commit adf4b28
Show file tree

Hide file tree

Showing 25 changed files with 4 additions and 3 deletions.
diff --git a/...ine/cases/examples/example-2/summary.json → .../examples/fuel_oil/example-2/summary.json b/...ine/cases/examples/example-2/summary.json → .../examples/fuel_oil/example-2/summary.json
diff --git a/...ne/cases/examples/breslow/natural-gas.csv → ...mples/natural_gas/breslow/natural-gas.csv b/...ne/cases/examples/breslow/natural-gas.csv → ...mples/natural_gas/breslow/natural-gas.csv
diff --git a/...ngine/cases/examples/breslow/summary.json → ...examples/natural_gas/breslow/summary.json b/...ngine/cases/examples/breslow/summary.json → ...examples/natural_gas/breslow/summary.json
diff --git a/...ngine/cases/examples/cali/natural-gas.csv → ...examples/natural_gas/cali/natural-gas.csv b/...ngine/cases/examples/cali/natural-gas.csv → ...examples/natural_gas/cali/natural-gas.csv
diff --git a/...s_engine/cases/examples/cali/summary.json → ...es/examples/natural_gas/cali/summary.json b/...s_engine/cases/examples/cali/summary.json → ...es/examples/natural_gas/cali/summary.json
diff --git a/.../cases/examples/example-1/natural-gas.csv → ...les/natural_gas/example-1/natural-gas.csv b/.../cases/examples/example-1/natural-gas.csv → ...les/natural_gas/example-1/natural-gas.csv
diff --git a/...ine/cases/examples/example-1/summary.json → ...amples/natural_gas/example-1/summary.json b/...ine/cases/examples/example-1/summary.json → ...amples/natural_gas/example-1/summary.json
diff --git a/.../cases/examples/example-4/natural-gas.csv → ...les/natural_gas/example-4/natural-gas.csv b/.../cases/examples/example-4/natural-gas.csv → ...les/natural_gas/example-4/natural-gas.csv
diff --git a/...ine/cases/examples/example-4/summary.json → ...amples/natural_gas/example-4/summary.json b/...ine/cases/examples/example-4/summary.json → ...amples/natural_gas/example-4/summary.json
diff --git a/...amples/feldman/natural-gas-eversource.csv → ...al_gas/feldman/natural-gas-eversource.csv b/...amples/feldman/natural-gas-eversource.csv → ...al_gas/feldman/natural-gas-eversource.csv
diff --git a/...ne/cases/examples/feldman/natural-gas.csv → ...mples/natural_gas/feldman/natural-gas.csv b/...ne/cases/examples/feldman/natural-gas.csv → ...mples/natural_gas/feldman/natural-gas.csv
diff --git a/...ngine/cases/examples/feldman/summary.json → ...examples/natural_gas/feldman/summary.json b/...ngine/cases/examples/feldman/summary.json → ...examples/natural_gas/feldman/summary.json
diff --git a/...ne/cases/examples/lewitus/natural-gas.csv → ...mples/natural_gas/lewitus/natural-gas.csv b/...ne/cases/examples/lewitus/natural-gas.csv → ...mples/natural_gas/lewitus/natural-gas.csv
diff --git a/...ngine/cases/examples/lewitus/summary.json → ...examples/natural_gas/lewitus/summary.json b/...ngine/cases/examples/lewitus/summary.json → ...examples/natural_gas/lewitus/summary.json
diff --git a/...es/quateman/natural-gas-national-grid.csv → ...as/quateman/natural-gas-national-grid.csv b/...es/quateman/natural-gas-national-grid.csv → ...as/quateman/natural-gas-national-grid.csv
diff --git a/...e/cases/examples/quateman/natural-gas.csv → ...ples/natural_gas/quateman/natural-gas.csv b/...e/cases/examples/quateman/natural-gas.csv → ...ples/natural_gas/quateman/natural-gas.csv
diff --git a/...gine/cases/examples/quateman/summary.json → ...xamples/natural_gas/quateman/summary.json b/...gine/cases/examples/quateman/summary.json → ...xamples/natural_gas/quateman/summary.json
diff --git a/...ngine/cases/examples/shen/natural-gas.csv → ...examples/natural_gas/shen/natural-gas.csv b/...ngine/cases/examples/shen/natural-gas.csv → ...examples/natural_gas/shen/natural-gas.csv
diff --git a/...s_engine/cases/examples/shen/summary.json → ...es/examples/natural_gas/shen/summary.json b/...s_engine/cases/examples/shen/summary.json → ...es/examples/natural_gas/shen/summary.json
diff --git a/...gine/cases/examples/vitti/natural-gas.csv → ...xamples/natural_gas/vitti/natural-gas.csv b/...gine/cases/examples/vitti/natural-gas.csv → ...xamples/natural_gas/vitti/natural-gas.csv
diff --git a/..._engine/cases/examples/vitti/summary.json → ...s/examples/natural_gas/vitti/summary.json b/..._engine/cases/examples/vitti/summary.json → ...s/examples/natural_gas/vitti/summary.json
diff --git a/...cases/examples/yellepeddi/natural-gas.csv → ...es/natural_gas/yellepeddi/natural-gas.csv b/...cases/examples/yellepeddi/natural-gas.csv → ...es/natural_gas/yellepeddi/natural-gas.csv
diff --git a/...ne/cases/examples/yellepeddi/summary.json → ...mples/natural_gas/yellepeddi/summary.json b/...ne/cases/examples/yellepeddi/summary.json → ...mples/natural_gas/yellepeddi/summary.json
diff --git a/rules-engine/tests/test_rules_engine/test_fuel_oil.py b/rules-engine/tests/test_rules_engine/test_fuel_oil.py
diff --git a/.../tests/test_rules_engine/test_examples.py → ...sts/test_rules_engine/test_natural_gas.py b/.../tests/test_rules_engine/test_examples.py → ...sts/test_rules_engine/test_natural_gas.py
@@ -22,12 +22,13 @@
 # Test inputs are provided as separate directory within the "cases/examples" directory
 # Each subdirectory contains a JSON file (named summary.json) which specifies the inputs for the test runner
 ROOT_DIR = pathlib.Path(__file__).parent / "cases" / "examples"
+NATURAL_GAS_DIR = ROOT_DIR / "natural_gas"
 
 # TODO: example-2 is OIL; need to find the source data for example-1 and example-4 for Natural Gas and update csv
 YET_TO_BE_UPDATED_EXAMPLES = ("example-1", "example-2", "example-4")
 # Filter out failing examples for now
 INPUT_DATA = filter(
-    lambda d: d not in YET_TO_BE_UPDATED_EXAMPLES, next(os.walk(ROOT_DIR))[1]
+    lambda d: d not in YET_TO_BE_UPDATED_EXAMPLES, next(os.walk(NATURAL_GAS_DIR))[1]
 )
 
 
@@ -52,7 +53,7 @@ class Example(BaseModel):
 
 
 def load_summary(folder: str) -> Summary:
-    with open(ROOT_DIR / folder / "summary.json") as f:
+    with open(NATURAL_GAS_DIR / folder / "summary.json") as f:
         d = json.load(f)
         return Summary(**d)
 
@@ -62,7 +63,7 @@ def load_natural_gas(
 ) -> NaturalGasBillingExampleInput:
     records = []
 
-    with open(ROOT_DIR / folder / "natural-gas.csv") as f:
+    with open(NATURAL_GAS_DIR / folder / "natural-gas.csv") as f:
         reader = csv.DictReader(f)
         row: Any
         for row in reader: