diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/CSGTextCache.cc | 8 | ||||
| -rw-r--r-- | tests/CSGTextCache.h | 4 | ||||
| -rw-r--r-- | tests/cgalpngtest.cc | 1 | ||||
| -rw-r--r-- | tests/cgaltest.cc | 1 | ||||
| -rw-r--r-- | tests/csgtermtest.cc | 1 | ||||
| -rw-r--r-- | tests/regression/echotest/string-indexing-expected.txt | 11 |
7 files changed, 20 insertions, 13 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5315c01..5e93680 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -203,7 +203,6 @@ set(CORE_SOURCES tests-common.cc ../src/mathc99.cc ../src/handle_dep.cc - ../src/qhash.cc ../src/value.cc ../src/expr.cc ../src/func.cc @@ -244,7 +243,6 @@ set(CGAL_SOURCES ../src/CGALEvaluator.cc ../src/CGALCache.cc ../src/PolySetCGALEvaluator.cc - ../src/qhash.cc ../src/CGAL_Nef_polyhedron_DxfData.cc ../src/cgaladv_minkowski2.cc ../src/cgaladv_convexhull2.cc) @@ -309,7 +307,7 @@ target_link_libraries(dumptest tests-common tests-nocgal ${QT_LIBRARIES} ${OPENG # # csgtexttest # -add_executable(csgtexttest csgtexttest.cc CSGTextRenderer.cc CSGTextCache.cc ../src/qhash.cc) +add_executable(csgtexttest csgtexttest.cc CSGTextRenderer.cc CSGTextCache.cc) target_link_libraries(csgtexttest tests-common tests-nocgal ${QT_LIBRARIES} ${OPENGL_LIBRARY} ${Boost_LIBRARIES}) # @@ -416,7 +414,8 @@ list(APPEND ECHO_FILES ${FUNCTION_FILES} ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/parser-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/builtin-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/dim-all.scad - ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/string-test.scad) + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/string-test.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/string-indexing.scad) # Add echotest tests to CTest add_cmdline_test(echotest txt ${ECHO_FILES}) diff --git a/tests/CSGTextCache.cc b/tests/CSGTextCache.cc index 4234c63..e512dfb 100644 --- a/tests/CSGTextCache.cc +++ b/tests/CSGTextCache.cc @@ -2,23 +2,23 @@ bool CSGTextCache::contains(const AbstractNode &node) const { - return this->cache.contains(this->tree.getString(node)); + return this->cache.find(this->tree.getString(node)) != this->cache.end(); } // We cannot return a reference since the [] operator returns a temporary value string CSGTextCache::operator[](const AbstractNode &node) const { - return this->cache[this->tree.getString(node)]; + return this->cache.at(this->tree.getString(node)); } void CSGTextCache::insert(const class AbstractNode &node, const string & value) { - this->cache.insert(this->tree.getString(node), value); + this->cache.insert(std::make_pair(this->tree.getString(node), value)); } void CSGTextCache::remove(const class AbstractNode &node) { - this->cache.remove(this->tree.getString(node)); + this->cache.erase(this->tree.getString(node)); } void CSGTextCache::clear() diff --git a/tests/CSGTextCache.h b/tests/CSGTextCache.h index 57a6972..62f26ce 100644 --- a/tests/CSGTextCache.h +++ b/tests/CSGTextCache.h @@ -1,9 +1,9 @@ #ifndef CSGTEXTCACHE_H_ #define CSGTEXTCACHE_H_ -#include "myqhash.h" #include "Tree.h" #include <string> +#include <boost/unordered_map.hpp> using std::string; @@ -20,7 +20,7 @@ public: void clear(); private: - QHash<string, string> cache; + boost::unordered_map<string, string> cache; const Tree &tree; }; diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc index 01722cf..bfa92da 100644 --- a/tests/cgalpngtest.cc +++ b/tests/cgalpngtest.cc @@ -24,7 +24,6 @@ * */ -#include "myqhash.h" #include "tests-common.h" #include "openscad.h" #include "node.h" diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc index 0b433bf..055e970 100644 --- a/tests/cgaltest.cc +++ b/tests/cgaltest.cc @@ -24,7 +24,6 @@ * */ -#include "myqhash.h" #include "tests-common.h" #include "openscad.h" #include "node.h" diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index c8fcc6b..8f2d76e 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -24,7 +24,6 @@ * */ -#include "myqhash.h" #include "tests-common.h" #include "PolySetEvaluator.h" #include "CSGTermEvaluator.h" diff --git a/tests/regression/echotest/string-indexing-expected.txt b/tests/regression/echotest/string-indexing-expected.txt new file mode 100644 index 0000000..3fcdfa4 --- /dev/null +++ b/tests/regression/echotest/string-indexing-expected.txt @@ -0,0 +1,11 @@ +ECHO: "t" +ECHO: "e" +ECHO: "s" +ECHO: "t" +ECHO: undef +ECHO: undef +ECHO: undef +ECHO: undef +ECHO: undef +ECHO: undef +ECHO: "e" |