TestTokenList: small cleanup (danmar#7514)

Author: firewave

test/testtokenlist.cpp

@@ -36,13 +36,10 @@
 
 class TestTokenList : public TestFixture {
 public:
-    TestTokenList() : TestFixture("TestTokenList") {
-        settings.enforcedLang = Standards::Language::C;
-    }
+    TestTokenList() : TestFixture("TestTokenList")
+    {}
 
 private:
-    /*const*/ Settings settings;
-
     void run() override {
         TEST_CASE(testaddtoken1);
         TEST_CASE(testaddtoken2);
@@ -55,15 +52,14 @@ class TestTokenList : public TestFixture {
     // inspired by #5895
     void testaddtoken1() const {
         const std::string code = "0x89504e470d0a1a0a";
-        TokenList tokenlist(settings, Standards::Language::CPP);
+        TokenList tokenlist(settingsDefault, Standards::Language::CPP);
         tokenlist.addtoken(code, 1, 1, false);
         ASSERT_EQUALS("0x89504e470d0a1a0a", tokenlist.front()->str());
     }
 
     void testaddtoken2() const {
         const std::string code = "0xF0000000";
-        /*const*/ Settings settings1 = settings;
-        settings1.platform.int_bit = 32;
+        const Settings settings1 = dinit(Settings, $.platform.int_bit = 32);
         TokenList tokenlist(settings1, Standards::Language::CPP);
         tokenlist.addtoken(code, 1, 1, false);
         ASSERT_EQUALS("0xF0000000", tokenlist.front()->str());
@@ -174,7 +170,7 @@ class TestTokenList : public TestFixture {
     void ast1() const {
         const std::string s = "('Release|x64' == 'Release|x64');";
 
-        TokenList tokenlist(settings, Standards::Language::C);
+        TokenList tokenlist(settingsDefault, Standards::Language::C);
         std::istringstream istr(s);
         ASSERT(tokenlist.createTokens(istr));
         // TODO: put this logic in TokenList