From 18132277c31dd69ae5b8d457b6040aa50ecd5e0c Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Thu, 28 May 2020 19:10:33 +0200
Subject: [PATCH] Fixed tests

---
 ...e17daca5f3e1_main.nwd => 1_0e17daca5f3e1.nwd} |  0
 ...a6562590ef19_main.nwd => 1_1a6562590ef19.nwd} |  0
 ...1489056e0916_main.nwd => 1_31489056e0916.nwd} |  0
 ...8010bd9270f9_main.nwd => 1_98010bd9270f9.nwd} |  0
 tests/test_gui.py                                | 16 ++++++++--------
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename tests/reference/gui/{1_e17daca5f3e1_main.nwd => 1_0e17daca5f3e1.nwd} (100%)
 rename tests/reference/gui/{1_a6562590ef19_main.nwd => 1_1a6562590ef19.nwd} (100%)
 rename tests/reference/gui/{1_1489056e0916_main.nwd => 1_31489056e0916.nwd} (100%)
 rename tests/reference/gui/{1_8010bd9270f9_main.nwd => 1_98010bd9270f9.nwd} (100%)

diff --git a/tests/reference/gui/1_e17daca5f3e1_main.nwd b/tests/reference/gui/1_0e17daca5f3e1.nwd
similarity index 100%
rename from tests/reference/gui/1_e17daca5f3e1_main.nwd
rename to tests/reference/gui/1_0e17daca5f3e1.nwd
diff --git a/tests/reference/gui/1_a6562590ef19_main.nwd b/tests/reference/gui/1_1a6562590ef19.nwd
similarity index 100%
rename from tests/reference/gui/1_a6562590ef19_main.nwd
rename to tests/reference/gui/1_1a6562590ef19.nwd
diff --git a/tests/reference/gui/1_1489056e0916_main.nwd b/tests/reference/gui/1_31489056e0916.nwd
similarity index 100%
rename from tests/reference/gui/1_1489056e0916_main.nwd
rename to tests/reference/gui/1_31489056e0916.nwd
diff --git a/tests/reference/gui/1_8010bd9270f9_main.nwd b/tests/reference/gui/1_98010bd9270f9.nwd
similarity index 100%
rename from tests/reference/gui/1_8010bd9270f9_main.nwd
rename to tests/reference/gui/1_98010bd9270f9.nwd
diff --git a/tests/test_gui.py b/tests/test_gui.py
index 47432f51..3d202b18 100644
--- a/tests/test_gui.py
+++ b/tests/test_gui.py
@@ -237,14 +237,14 @@ def testMainWindows(qtbot, nwTempGUI, nwRef, nwTemp):
     # Check the files
     refFile = path.join(nwTempGUI,"nwProject.nwx")
     assert cmpFiles(refFile, path.join(nwRef,"gui","1_nwProject.nwx"), [2])
-    refFile = path.join(nwTempGUI,"data_0","e17daca5f3e1_main.nwd")
-    assert cmpFiles(refFile, path.join(nwRef,"gui","1_e17daca5f3e1_main.nwd"))
-    refFile = path.join(nwTempGUI,"data_9","8010bd9270f9_main.nwd")
-    assert cmpFiles(refFile, path.join(nwRef,"gui","1_8010bd9270f9_main.nwd"))
-    refFile = path.join(nwTempGUI,"data_3","1489056e0916_main.nwd")
-    assert cmpFiles(refFile, path.join(nwRef,"gui","1_1489056e0916_main.nwd"))
-    refFile = path.join(nwTempGUI,"data_1","a6562590ef19_main.nwd")
-    assert cmpFiles(refFile, path.join(nwRef,"gui","1_a6562590ef19_main.nwd"))
+    refFile = path.join(nwTempGUI,"content","0e17daca5f3e1.nwd")
+    assert cmpFiles(refFile, path.join(nwRef,"gui","1_0e17daca5f3e1.nwd"))
+    refFile = path.join(nwTempGUI,"content","98010bd9270f9.nwd")
+    assert cmpFiles(refFile, path.join(nwRef,"gui","1_98010bd9270f9.nwd"))
+    refFile = path.join(nwTempGUI,"content","31489056e0916.nwd")
+    assert cmpFiles(refFile, path.join(nwRef,"gui","1_31489056e0916.nwd"))
+    refFile = path.join(nwTempGUI,"content","1a6562590ef19.nwd")
+    assert cmpFiles(refFile, path.join(nwRef,"gui","1_1a6562590ef19.nwd"))
 
     nwGUI.closeMain()
     # qtbot.stopForInteraction()