From 5f01a1bde239879a0430b50fdddb325415c44eea Mon Sep 17 00:00:00 2001
From: David Vierra <codewarrior@hawaii.rr.com>
Date: Wed, 28 Oct 2015 00:50:27 -1000
Subject: [PATCH] Rewrite test fixtures using _temp_file and _temp_level

---
 tests/test_mceditlib/conftest.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/test_mceditlib/conftest.py b/tests/test_mceditlib/conftest.py
index 36617c2..8e669b8 100644
--- a/tests/test_mceditlib/conftest.py
+++ b/tests/test_mceditlib/conftest.py
@@ -12,18 +12,19 @@ from mceditlib.worldeditor import WorldEditor
 
 _TEST_FILES_DIR = "test_files"
 
-# from $PROJECT/src/mceditlib/test/templevel.py, get to $PROJECT/test_files
+# from $PROJECT/tests/test_mceditlib/conftest.py, get to $PROJECT/test_files
 
-_PROJECT = dirname(dirname(dirname(dirname(__file__))))
+_PROJECT = dirname(dirname(dirname(__file__)))
 TEST_FILES_DIR = py.path.local(_PROJECT).join(_TEST_FILES_DIR)
 
-@pytest.fixture
-def temp_level(temp_file):
-    return WorldEditor(temp_file.strpath)
-
 @pytest.fixture
 def temp_file(tmpdir, request):
-    filename = request.param
+    return _temp_file(tmpdir, request.param)
+
+def _temp_level(tmpdir, filename):
+    return WorldEditor(_temp_file(tmpdir, filename).strpath)
+
+def _temp_file(tmpdir, filename):
     source = TEST_FILES_DIR.join(filename)
     assert source.exists()
 
@@ -34,17 +35,17 @@ def temp_file(tmpdir, request):
 
 @pytest.fixture
 def indev_file(tmpdir):
-    return TempFile(tmpdir, "indev.mclevel")
+    return _temp_file(tmpdir, "indev.mclevel")
 
 
 @pytest.fixture
 def pc_world(tmpdir):
-    return TempLevel(tmpdir, "AnvilWorld")
+    return _temp_level(tmpdir, "AnvilWorld")
 
 
 @pytest.fixture(params=["Station.schematic"])
 def schematic_world(tmpdir, request):
-    return TempLevel(tmpdir, request.param)
+    return _temp_level(tmpdir, request.param)
 
 
 @pytest.fixture(params=["AnvilWorld", "Floating.schematic"])
@@ -58,4 +59,4 @@ def any_world(request):
 
         # return TempLevel("XXX", createFunc=unpackPocket)
 
-    return TempLevel(request.param)
\ No newline at end of file
+    return _temp_level(request.param)
\ No newline at end of file