aboutsummaryrefslogtreecommitdiffstats
path: root/src/tests/tests.h
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-12-19 00:32:51 -0500
committerJack Lloyd <[email protected]>2016-12-19 00:32:51 -0500
commit4b1a1fd5ec72df31bc43c5d82311a316c60d61f6 (patch)
tree3faf085ba5270f92d1d50b09e5fd642f9041b035 /src/tests/tests.h
parentabac6ab59b363c2ac571d13496a70d98e04a5c2f (diff)
Minor refactoring of Text_Based_Test
Turns out astyle has some bugs wrt C++11 initialize lists. Rather than having astyle mangle all of the tests, convert to using a string which is split once at the start instead of a vector of keys.
Diffstat (limited to 'src/tests/tests.h')
-rw-r--r--src/tests/tests.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/tests/tests.h b/src/tests/tests.h
index 51b59d972..ce6431e35 100644
--- a/src/tests/tests.h
+++ b/src/tests/tests.h
@@ -408,13 +408,8 @@ class Text_Based_Test : public Test
{
public:
Text_Based_Test(const std::string& input_file,
- const std::vector<std::string>& required_keys,
- const std::vector<std::string>& optional_keys = {});
-
- Text_Based_Test(const std::string& algo,
- const std::string& input_file,
- const std::vector<std::string>& required_keys,
- const std::vector<std::string>& optional_keys = {});
+ const std::string& required_keys,
+ const std::string& optional_keys = "");
virtual bool clear_between_callbacks() const { return true; }
@@ -444,10 +439,7 @@ class Text_Based_Test : public Test
size_t get_req_sz(const VarMap& vars, const std::string& key) const;
size_t get_opt_sz(const VarMap& vars, const std::string& key, const size_t def_value) const;
-
- std::string algo_name() const { return m_algo; }
private:
- std::string m_algo;
std::string m_data_src;
std::set<std::string> m_required_keys;
std::set<std::string> m_optional_keys;