From 06337cedf5e460eaa1775d3672a4f9adb81a9f28 Mon Sep 17 00:00:00 2001
From: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Date: Mon, 22 Jul 2019 10:26:55 +0200
Subject: [PATCH] Run more tests on full token list (#2020)

Since all checks are run on the full token list and not the simplified
one, run the tests on the full token list as well.
---
 test/testconstructors.cpp   | 1 -
 test/testsymboldatabase.cpp | 1 -
 test/testuninitvar.cpp      | 3 ---
 test/testunusedprivfunc.cpp | 1 -
 4 files changed, 6 deletions(-)

diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
index b035e2687..68b4167d6 100644
--- a/test/testconstructors.cpp
+++ b/test/testconstructors.cpp
@@ -41,7 +41,6 @@ private:
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");
-        tokenizer.simplifyTokenList2();
 
         // Check class constructors..
         CheckClass checkClass(&tokenizer, &settings, this);
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index 295ca740f..1c2574501 100644
--- a/test/testsymboldatabase.cpp
+++ b/test/testsymboldatabase.cpp
@@ -1853,7 +1853,6 @@ private:
         Tokenizer tokenizer(&settings1, this);
         std::istringstream istr(code);
         tokenizer.tokenize(istr, filename);
-        tokenizer.simplifyTokenList2();
 
         // force symbol database creation
         tokenizer.createSymbolDatabase();
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index 100bf43a6..2557aaaab 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -3933,7 +3933,6 @@ private:
         Tokenizer tokenizer(&settings, this);
         std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");
-        tokenizer.simplifyTokenList2();
 
         // Check code..
         CheckUninitVar check(&tokenizer, &settings, this);
@@ -3952,8 +3951,6 @@ private:
         std::istringstream istr(code);
         tokenizer.tokenize(istr, "test.cpp");
 
-        tokenizer.simplifyTokenList2();
-
         // Check for redundant code..
         CheckUninitVar checkuninitvar(&tokenizer, &settings, this);
         checkuninitvar.valueFlowUninit();
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
index 2ee9093e9..81c13c439 100644
--- a/test/testunusedprivfunc.cpp
+++ b/test/testunusedprivfunc.cpp
@@ -105,7 +105,6 @@ private:
         Tokenizer tokenizer(&settings, this);
         tokenizer.createTokens(&tokens2);
         tokenizer.simplifyTokens1("");
-        tokenizer.simplifyTokenList2();
 
         // Check for unused private functions..
         CheckClass checkClass(&tokenizer, &settings, this);