Merge branch 'preprocessor' of https://github.com/ghewgill/cppcheck into ghewgill-preprocessor

Daniel Marjamäki · Daniel Marjamäki · commit 8c5ec0df7dac · 2011-02-13T18:13:35.000+01:00
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
@@ -1233,21 +1233,43 @@ class TestPreprocessor : public TestFixture
 
     void if_cond7()
     {
-        const char filedata[] = "#define A 1\n"
-                                "#if A==1\n"
-                                "a1;\n"
-                                "#endif\n";
+        {
+            const char filedata[] = "#define A 1\n"
+                                    "#if A==1\n"
+                                    "a1;\n"
+                                    "#endif\n";
 
-        // Preprocess => actual result..
-        std::istringstream istr(filedata);
-        std::map<std::string, std::string> actual;
-        Settings settings;
-        Preprocessor preprocessor(&settings, this);
-        preprocessor.preprocess(istr, actual, "file.c");
+            // Preprocess => actual result..
+            std::istringstream istr(filedata);
+            std::map<std::string, std::string> actual;
+            Settings settings;
+            Preprocessor preprocessor(&settings, this);
+            preprocessor.preprocess(istr, actual, "file.c");
 
-        // Compare results..
-        ASSERT_EQUALS(1, (int)actual.size());
-        ASSERT_EQUALS("\n\na1;\n\n", actual[""]);
+            // Compare results..
+            ASSERT_EQUALS(1, (int)actual.size());
+            ASSERT_EQUALS("\n\na1;\n\n", actual[""]);
+        }
+
+        {
+            const char filedata[] = "#define A 0\n"
+                                    "#if A\n"
+                                    "foo();\n"
+                                    "#endif\n";
+
+            // Preprocess => actual result..
+            std::istringstream istr(filedata);
+            std::map<std::string, std::string> actual;
+            Settings settings;
+            Preprocessor preprocessor(&settings, this);
+            preprocessor.preprocess(istr, actual, "file.c");
+
+            // Compare results..
+            TODO_ASSERT_EQUALS(2,
+                               1, static_cast<unsigned int>(actual.size()));
+            TODO_ASSERT_EQUALS("\n\n\n\n",
+                               "\n\nfoo();\n\n", actual[""]);
+        }
     }
 
 
