From ca73d847fc144056b5e15d24f07201b180ba8406 Mon Sep 17 00:00:00 2001
From: Sam Jenkins <s.jenkins@stfc.ac.uk>
Date: Tue, 25 Sep 2018 16:51:18 +0100
Subject: [PATCH] Re #23574 updated unit tests
---
Framework/DataHandling/test/LoadBinStlTest.h | 16 +++++++++++-----
Testing/Data/UnitTest/cylinderBin.stl.md5 | 1 +
2 files changed, 12 insertions(+), 5 deletions(-)
create mode 100644 Testing/Data/UnitTest/cylinderBin.stl.md5
diff --git a/Framework/DataHandling/test/LoadBinStlTest.h b/Framework/DataHandling/test/LoadBinStlTest.h
index bc615e896ed..3e828f96b44 100644
--- a/Framework/DataHandling/test/LoadBinStlTest.h
+++ b/Framework/DataHandling/test/LoadBinStlTest.h
@@ -1,3 +1,6 @@
+#ifndef LOAD_BINSTL_TEST_H_
+#define LOAD_BINSTL_TEST_H_
+
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/Sample.h"
@@ -39,8 +42,8 @@ void test_cube() {
TS_ASSERT_EQUALS(cube->numberOfTriangles(), 12);
TS_ASSERT_DELTA(cube->volume(), 3000, 0.001);
}
- //test removed because currently no cylinderBin.stl
- void xtest_cylinder() {
+
+ void test_cylinder() {
std::string path = FileFinder::Instance().getFullPath("cylinderBin.stl");
std::unique_ptr<LoadBinStl> Loader = std::make_unique<LoadBinStl>(path);
auto cylinder = Loader->readStl();
@@ -59,16 +62,19 @@ void test_cube() {
TS_ASSERT_EQUALS(tube->numberOfTriangles(), 2160);
TS_ASSERT_DELTA(tube->volume(), 7068, 1);
}
-
+ //check that isBinaryStl returns false if the file contains an incomplete vertex
void test_fail_invalid_vertex() {
std::string path = FileFinder::Instance().getFullPath("invalid_vertexBin.stl");
std::unique_ptr<LoadBinStl> Loader = std::make_unique<LoadBinStl>(path);
TS_ASSERT(!(Loader->isBinarySTL()));
}
-
+ //check that isBinaryStl returns false if the file contains an incomplete triangle
void test_fail_invalid_triangle() {
std::string path = FileFinder::Instance().getFullPath("invalid_triangleBin.stl");
std::unique_ptr<LoadBinStl> Loader = std::make_unique<LoadBinStl>(path);
TS_ASSERT(!(Loader->isBinarySTL()));
}
-};
\ No newline at end of file
+};
+//add tests for isBinaryStl e.g. attempting to load an ascii .stl
+
+#endif /* LOAD_BINSTL_TEST_H_ */
\ No newline at end of file
diff --git a/Testing/Data/UnitTest/cylinderBin.stl.md5 b/Testing/Data/UnitTest/cylinderBin.stl.md5
new file mode 100644
index 00000000000..0b07c4d9b75
--- /dev/null
+++ b/Testing/Data/UnitTest/cylinderBin.stl.md5
@@ -0,0 +1 @@
+8371032c426dd1dc102156c9d8987dd9
--
GitLab