Removed static std::string.

johnsyweb · johnsyweb · commit afc6d4507dbf · 2010-09-26T16:52:30.000+10:00
which_test() doesn't have to calculate anything, could be inlined.
diff --git a/test/options.cpp b/test/options.cpp
@@ -20,9 +20,14 @@ options::options(int argc, const char* argv[])
     :_options(&argv[1], &argv[0] + argc)
     ,_gcc_style_errors(_options.count("-g") != 0)
     ,_quiet(_options.count("-q") != 0)
+    ,_which_test("")
 {
     _options.erase("-g");
     _options.erase("-q");
+    if (not _options.empty())
+    {
+        _which_test = *_options.rbegin();
+    }
 }
 
 bool options::quiet() const
@@ -37,11 +42,6 @@ bool options::gcc_style_errors() const
 
 const std::string& options::which_test() const
 {
-    static std::string ret = "";
-    if (not _options.empty())
-    {
-        ret = *_options.rbegin();
-    }
-    return ret;
+    return _which_test;
 }
 
diff --git a/test/options.h b/test/options.h
@@ -37,6 +37,7 @@ class options
     std::set<std::string> _options;
     const bool _gcc_style_errors;
     const bool _quiet;
+    std::string _which_test;
 };
 
 #endif
diff --git a/test/testoptions.cpp b/test/testoptions.cpp
@@ -34,6 +34,7 @@ class TestOptions: public TestFixture
     {
         TEST_CASE(which_test);
         TEST_CASE(which_test_method);
+        TEST_CASE(no_test_method);
         TEST_CASE(not_quiet);
         TEST_CASE(quiet);
         TEST_CASE(gcc_errors);
@@ -58,6 +59,14 @@ class TestOptions: public TestFixture
     }
 
 
+    void no_test_method()
+    {
+        const char* argv[] = {"./test_runner"};
+        options args(sizeof argv / sizeof argv[0], argv);
+        ASSERT_EQUALS("", args.which_test());
+    }
+
+
     void not_quiet()
     {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-v"};

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,14 @@ options::options(int argc, const char* argv[])`
`20`	`20`	`:_options(&argv[1], &argv[0] + argc)`
`21`	`21`	`,_gcc_style_errors(_options.count("-g") != 0)`
`22`	`22`	`,_quiet(_options.count("-q") != 0)`
	`23`	`+ ,_which_test("")`
`23`	`24`	`{`
`24`	`25`	`_options.erase("-g");`
`25`	`26`	`_options.erase("-q");`
	`27`	`+ if (not _options.empty())`
	`28`	`+ {`
	`29`	`+ _which_test = *_options.rbegin();`
	`30`	`+ }`
`26`	`31`	`}`
`27`	`32`
`28`	`33`	`bool options::quiet() const`
`@@ -37,11 +42,6 @@ bool options::gcc_style_errors() const`
`37`	`42`
`38`	`43`	`const std::string& options::which_test() const`
`39`	`44`	`{`
`40`		`- static std::string ret = "";`
`41`		`- if (not _options.empty())`
`42`		`- {`
`43`		`- ret = *_options.rbegin();`
`44`		`- }`
`45`		`- return ret;`
	`45`	`+ return _which_test;`
`46`	`46`	`}`
`47`	`47`