Address some warnings on test code

amai2012 · amai2012 · commit 6db9c78fb6bb · 2017-05-03T14:39:21.000+02:00
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -927,34 +927,35 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(0, parser.GetIgnoredPaths().size());
     }
 
-    void ignorepaths1() {
-        REDIRECT;
-        const char *argv[] = {"cppcheck", "-isrc", "file.cpp"};
-        CmdLineParser parser(&settings);
-        ASSERT(parser.ParseFromArgs(3, argv));
-        ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
-        ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
-    }
-
-    void ignorepaths2() {
-        REDIRECT;
-        const char *argv[] = {"cppcheck", "-i", "src", "file.cpp"};
-        CmdLineParser parser(&settings);
-        ASSERT(parser.ParseFromArgs(4, argv));
-        ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
-        ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
-    }
+    /*
+        void ignorepaths1() {
+            REDIRECT;
+            const char *argv[] = {"cppcheck", "-isrc", "file.cpp"};
+            CmdLineParser parser(&settings);
+            ASSERT(parser.ParseFromArgs(3, argv));
+            ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
+            ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
+        }
 
-    void ignorepaths3() {
-        REDIRECT;
-        const char *argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"};
-        CmdLineParser parser(&settings);
-        ASSERT(parser.ParseFromArgs(4, argv));
-        ASSERT_EQUALS(2, parser.GetIgnoredPaths().size());
-        ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
-        ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]);
-    }
+        void ignorepaths2() {
+            REDIRECT;
+            const char *argv[] = {"cppcheck", "-i", "src", "file.cpp"};
+            CmdLineParser parser(&settings);
+            ASSERT(parser.ParseFromArgs(4, argv));
+            ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
+            ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
+        }
 
+        void ignorepaths3() {
+            REDIRECT;
+            const char *argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"};
+            CmdLineParser parser(&settings);
+            ASSERT(parser.ParseFromArgs(4, argv));
+            ASSERT_EQUALS(2, parser.GetIgnoredPaths().size());
+            ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
+            ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]);
+        }
+    */
     void ignorepaths4() {
         REDIRECT;
         const char *argv[] = {"cppcheck", "-i", "src", "-i", "module", "file.cpp"};
@@ -964,16 +965,16 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
         ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]);
     }
-
-    void ignorefilepaths1() {
-        REDIRECT;
-        const char *argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"};
-        CmdLineParser parser(&settings);
-        ASSERT(parser.ParseFromArgs(3, argv));
-        ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
-        ASSERT_EQUALS("foo.cpp", parser.GetIgnoredPaths()[0]);
-    }
-
+    /*
+        void ignorefilepaths1() {
+            REDIRECT;
+            const char *argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"};
+            CmdLineParser parser(&settings);
+            ASSERT(parser.ParseFromArgs(3, argv));
+            ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
+            ASSERT_EQUALS("foo.cpp", parser.GetIgnoredPaths()[0]);
+        }
+    */
     void ignorefilepaths2() {
         REDIRECT;
         const char *argv[] = {"cppcheck", "-isrc/foo.cpp", "file.cpp"};
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -1090,7 +1090,7 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode144() { // #6865
-        //ASSERT_THROW(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"), InternalError);
+        checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;");
     }
 
     void garbageCode146() { // #7081
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
@@ -57,7 +57,7 @@ class TestLibrary : public TestFixture {
         TEST_CASE(version);
     }
 
-    Library::Error readLibrary(Library& library, const char* xmldata) const {
+    static Library::Error readLibrary(Library& library, const char* xmldata) {
         tinyxml2::XMLDocument doc;
         doc.Parse(xmldata);
         return library.load(doc);

Original file line number	Diff line number	Diff line change
`@@ -1090,7 +1090,7 @@ class TestGarbage : public TestFixture {`
`1090`	`1090`	`}`
`1091`	`1091`
`1092`	`1092`	`void garbageCode144() { // #6865`
`1093`		`- //ASSERT_THROW(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"), InternalError);`
	`1093`	`+ checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;");`
`1094`	`1094`	`}`
`1095`	`1095`
`1096`	`1096`	`void garbageCode146() { // #7081`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class TestLibrary : public TestFixture {`
`57`	`57`	`TEST_CASE(version);`
`58`	`58`	`}`
`59`	`59`
`60`		`- Library::Error readLibrary(Library& library, const char* xmldata) const {`
	`60`	`+ static Library::Error readLibrary(Library& library, const char* xmldata) {`
`61`	`61`	`tinyxml2::XMLDocument doc;`
`62`	`62`	`doc.Parse(xmldata);`
`63`	`63`	`return library.load(doc);`