From 3f779bb7908b28282794d5857d20a6c423a2730f Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Thu, 21 Aug 2014 16:27:15 +0200
Subject: [PATCH] [T] Update test for ogs application.
Removing old files; Add current format project.
---
Applications/Tests.cmake | 11 ++++++++++-
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.bc.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.cnd.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gli.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gml.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.ic.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mfp.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mmp.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msh.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msp.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.num.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.out.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pcs.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pvd.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.rfd.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.st.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.tim.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x1000-y1000/case.vtu.md5 | 1 -
.../2d-quads-x1000-y1000/case_expected_result.vtu.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x200-y100/case.mcp.md5 | 1 -
Tests/Data/Elliptic/2d-quads-x200-y100/case.msp.md5 | 1 -
.../quad_20x10_GroundWaterFlow.prj.md5 | 1 +
.../quad_20x10_constMat0.mesh.vtu.md5 | 1 +
.../quad_20x10_left_right.gml.md5 | 1 +
24 files changed, 13 insertions(+), 21 deletions(-)
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.bc.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.cnd.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gli.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gml.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.ic.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mfp.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mmp.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msh.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msp.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.num.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.out.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pcs.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pvd.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.rfd.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.st.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.tim.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case.vtu.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x1000-y1000/case_expected_result.vtu.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x200-y100/case.mcp.md5
delete mode 100644 Tests/Data/Elliptic/2d-quads-x200-y100/case.msp.md5
create mode 100644 Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_GroundWaterFlow.prj.md5
create mode 100644 Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_constMat0.mesh.vtu.md5
create mode 100644 Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_left_right.gml.md5
diff --git a/Applications/Tests.cmake b/Applications/Tests.cmake
index 84879e3b445..a89ebcf5726 100644
--- a/Applications/Tests.cmake
+++ b/Applications/Tests.cmake
@@ -2,4 +2,13 @@
add_test(NAME ogs_no_args COMMAND ogs)
set_tests_properties(ogs_no_args PROPERTIES WILL_FAIL TRUE)
-AddOgsBenchmark(ogs_empty_project EmptyProject.xml)
+#AddOgsBenchmark(ogs_empty_project EmptyProject.xml)
+#AddOgsBenchmark(ogs_empty_project Elliptic/quad_20x10_GroundWaterFlow.prj)
+
+ExternalData_Add_Test(
+ data
+ NAME reading_GroundWaterFlow_project
+ COMMAND ogs DATA{${ExternalData_SOURCE_ROOT}/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_GroundWaterFlow.prj,quad_20x10_constMat0.mesh.vtu,quad_20x10_left_right.gml}
+)
+
+#AddTest(ogs DATA{${ExternalData_SOURCE_ROOT}/Elliptic/quad_20x10_GroundWaterFlow.prj} TIME)
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.bc.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.bc.md5
deleted file mode 100644
index 68ac2e096d6..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.bc.md5
+++ /dev/null
@@ -1 +0,0 @@
-6c5a67ef6572bbe5070fc331b1fc9a69
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.cnd.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.cnd.md5
deleted file mode 100644
index 7d308ccba74..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.cnd.md5
+++ /dev/null
@@ -1 +0,0 @@
-55bfc26fbcf45b779af3d0d688fb83b9
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gli.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gli.md5
deleted file mode 100644
index 877049f4b96..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gli.md5
+++ /dev/null
@@ -1 +0,0 @@
-e0e57cd16d19acea8a29d4c964dfb924
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gml.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gml.md5
deleted file mode 100644
index a543c1af910..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gml.md5
+++ /dev/null
@@ -1 +0,0 @@
-a054fc73631ae534b814184eb60977c7
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.ic.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.ic.md5
deleted file mode 100644
index 9c6e57ad21b..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.ic.md5
+++ /dev/null
@@ -1 +0,0 @@
-28e65510cf287ebd30821075d8e09ca8
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mfp.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mfp.md5
deleted file mode 100644
index b4244e260c1..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mfp.md5
+++ /dev/null
@@ -1 +0,0 @@
-29685f8dd61734ead5632b545726758c
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mmp.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mmp.md5
deleted file mode 100644
index c7df570ffb0..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mmp.md5
+++ /dev/null
@@ -1 +0,0 @@
-5835b975206ba98627a1b6f1dd6be7af
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msh.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msh.md5
deleted file mode 100644
index 31884ad2475..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msh.md5
+++ /dev/null
@@ -1 +0,0 @@
-e4c0846e14eeeb1807dd5a52bb98a8ea
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msp.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msp.md5
deleted file mode 100644
index c8f475148d6..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msp.md5
+++ /dev/null
@@ -1 +0,0 @@
-95ebb6b241466ad0b3c73167755a9b3b
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.num.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.num.md5
deleted file mode 100644
index 1c4025904ae..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.num.md5
+++ /dev/null
@@ -1 +0,0 @@
-2116bc15e48e7acabe5ffc3d0c5361fb
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.out.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.out.md5
deleted file mode 100644
index cb0e363a6bd..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.out.md5
+++ /dev/null
@@ -1 +0,0 @@
-5964016dd01863a99dac25487287b58a
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pcs.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pcs.md5
deleted file mode 100644
index 3cbbb8486ad..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pcs.md5
+++ /dev/null
@@ -1 +0,0 @@
-4eeb3894145d1b4821f23ed9a6d7f238
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pvd.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pvd.md5
deleted file mode 100644
index c63313d0e70..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pvd.md5
+++ /dev/null
@@ -1 +0,0 @@
-a74b042e3eccb2d4758068a8c289df14
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.rfd.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.rfd.md5
deleted file mode 100644
index c8f475148d6..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.rfd.md5
+++ /dev/null
@@ -1 +0,0 @@
-95ebb6b241466ad0b3c73167755a9b3b
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.st.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.st.md5
deleted file mode 100644
index c8f475148d6..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.st.md5
+++ /dev/null
@@ -1 +0,0 @@
-95ebb6b241466ad0b3c73167755a9b3b
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.tim.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.tim.md5
deleted file mode 100644
index a7edd5624ca..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.tim.md5
+++ /dev/null
@@ -1 +0,0 @@
-d671b92bd9c665a82dc0cdc20da91320
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.vtu.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.vtu.md5
deleted file mode 100644
index d252f598965..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.vtu.md5
+++ /dev/null
@@ -1 +0,0 @@
-a615a23368e4cae2d0e794681ba18677
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case_expected_result.vtu.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case_expected_result.vtu.md5
deleted file mode 100644
index d753d6982a5..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case_expected_result.vtu.md5
+++ /dev/null
@@ -1 +0,0 @@
-9bf2ebcfb38dae40c0a146c34724b463
diff --git a/Tests/Data/Elliptic/2d-quads-x200-y100/case.mcp.md5 b/Tests/Data/Elliptic/2d-quads-x200-y100/case.mcp.md5
deleted file mode 100644
index 34cdc644eb6..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x200-y100/case.mcp.md5
+++ /dev/null
@@ -1 +0,0 @@
-def4b0dfb8cd564a290fa534ea567291
diff --git a/Tests/Data/Elliptic/2d-quads-x200-y100/case.msp.md5 b/Tests/Data/Elliptic/2d-quads-x200-y100/case.msp.md5
deleted file mode 100644
index f9b8e074694..00000000000
--- a/Tests/Data/Elliptic/2d-quads-x200-y100/case.msp.md5
+++ /dev/null
@@ -1 +0,0 @@
-61c67e135d14f97cf717294aebff0495
diff --git a/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_GroundWaterFlow.prj.md5 b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_GroundWaterFlow.prj.md5
new file mode 100644
index 00000000000..fbfd7c259f3
--- /dev/null
+++ b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_GroundWaterFlow.prj.md5
@@ -0,0 +1 @@
+c00fe2789980ff8fc6151db2e5ac8acf
diff --git a/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_constMat0.mesh.vtu.md5 b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_constMat0.mesh.vtu.md5
new file mode 100644
index 00000000000..63fb272f5ca
--- /dev/null
+++ b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_constMat0.mesh.vtu.md5
@@ -0,0 +1 @@
+52ee66a799bee3b174e5aaab7660eeae
diff --git a/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_left_right.gml.md5 b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_left_right.gml.md5
new file mode 100644
index 00000000000..6c6e44e78bc
--- /dev/null
+++ b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_left_right.gml.md5
@@ -0,0 +1 @@
+07a029d1604f0b2a0b441dbf2a3ed383
--
GitLab