Fix compilation of tests with QT_NO_CAST_FROM_ASCII.

Change-Id: Id1c7564b70719900cf3f5508faac0cab00b0afa0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Friedemann Kleint
2012-11-22 10:46:07 +01:00
parent bfd5519caf
commit cb64537a24

View File

@@ -139,13 +139,13 @@ void CppToolsPlugin::test_completion_forward_declarations_present()
setup(&data);
Utils::ChangeSet change;
change.insert(data.pos, "Foo::Bar::");
change.insert(data.pos, QLatin1String("Foo::Bar::"));
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += 10;
QStringList expected;
expected.append("Bar");
expected.append(QLatin1String("Bar"));
QStringList completions = getCompletions(data);
@@ -172,24 +172,24 @@ void CppToolsPlugin::test_completion_basic_1()
QStringList basicCompletions = getCompletions(data);
QVERIFY(!basicCompletions.contains("foo"));
QVERIFY(!basicCompletions.contains("m"));
QVERIFY(basicCompletions.contains("Foo"));
QVERIFY(basicCompletions.contains("func"));
QVERIFY(basicCompletions.contains("f"));
QVERIFY(!basicCompletions.contains(QLatin1String("foo")));
QVERIFY(!basicCompletions.contains(QLatin1String("m")));
QVERIFY(basicCompletions.contains(QLatin1String("Foo")));
QVERIFY(basicCompletions.contains(QLatin1String("func")));
QVERIFY(basicCompletions.contains(QLatin1String("f")));
Utils::ChangeSet change;
change.insert(data.pos, "f.");
change.insert(data.pos, QLatin1String("f."));
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += 2;
QStringList memberCompletions = getCompletions(data);
QVERIFY(memberCompletions.contains("foo"));
QVERIFY(memberCompletions.contains("m"));
QVERIFY(!memberCompletions.contains("func"));
QVERIFY(!memberCompletions.contains("f"));
QVERIFY(memberCompletions.contains(QLatin1String("foo")));
QVERIFY(memberCompletions.contains(QLatin1String("m")));
QVERIFY(!memberCompletions.contains(QLatin1String("func")));
QVERIFY(!memberCompletions.contains(QLatin1String("f")));
}
void CppToolsPlugin::test_completion_template_1()
@@ -213,19 +213,19 @@ void CppToolsPlugin::test_completion_template_1()
setup(&data);
Utils::ChangeSet change;
change.insert(data.pos, "Foo::");
change.insert(data.pos, QLatin1String("Foo::"));
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += 5;
QStringList completions = getCompletions(data);
QVERIFY(completions.contains("Type"));
QVERIFY(completions.contains("foo"));
QVERIFY(completions.contains("m"));
QVERIFY(!completions.contains("T"));
QVERIFY(!completions.contains("f"));
QVERIFY(!completions.contains("func"));
QVERIFY(completions.contains(QLatin1String("Type")));
QVERIFY(completions.contains(QLatin1String("foo")));
QVERIFY(completions.contains(QLatin1String("m")));
QVERIFY(!completions.contains(QLatin1String("T")));
QVERIFY(!completions.contains(QLatin1String("f")));
QVERIFY(!completions.contains(QLatin1String("func")));
}
void CppToolsPlugin::test_completion_template_2()
@@ -258,9 +258,9 @@ void CppToolsPlugin::test_completion_template_2()
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 3);
QVERIFY(completions.contains("Tupple"));
QVERIFY(completions.contains("a"));
QVERIFY(completions.contains("b"));
QVERIFY(completions.contains(QLatin1String("Tupple")));
QVERIFY(completions.contains(QLatin1String("a")));
QVERIFY(completions.contains(QLatin1String("b")));
}
void CppToolsPlugin::test_completion_template_3()
@@ -293,9 +293,9 @@ void CppToolsPlugin::test_completion_template_3()
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 3);
QVERIFY(completions.contains("Tupple"));
QVERIFY(completions.contains("a"));
QVERIFY(completions.contains("b"));
QVERIFY(completions.contains(QLatin1String("Tupple")));
QVERIFY(completions.contains(QLatin1String("a")));
QVERIFY(completions.contains(QLatin1String("b")));
}
void CppToolsPlugin::test_completion_template_4()
@@ -329,9 +329,9 @@ void CppToolsPlugin::test_completion_template_4()
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 3);
QVERIFY(completions.contains("Tupple"));
QVERIFY(completions.contains("a"));
QVERIFY(completions.contains("b"));
QVERIFY(completions.contains(QLatin1String("Tupple")));
QVERIFY(completions.contains(QLatin1String("a")));
QVERIFY(completions.contains(QLatin1String("b")));
}
void CppToolsPlugin::test_completion_template_5()
@@ -365,9 +365,9 @@ void CppToolsPlugin::test_completion_template_5()
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 3);
QVERIFY(completions.contains("Tupple"));
QVERIFY(completions.contains("a"));
QVERIFY(completions.contains("b"));
QVERIFY(completions.contains(QLatin1String("Tupple")));
QVERIFY(completions.contains(QLatin1String("a")));
QVERIFY(completions.contains(QLatin1String("b")));
}
void CppToolsPlugin::test_completion_template_6()
@@ -405,8 +405,8 @@ void CppToolsPlugin::test_completion_template_6()
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 2);
QVERIFY(completions.contains("Item"));
QVERIFY(completions.contains("i"));
QVERIFY(completions.contains(QLatin1String("Item")));
QVERIFY(completions.contains(QLatin1String("i")));
}
void CppToolsPlugin::test_completion()
@@ -419,7 +419,7 @@ void CppToolsPlugin::test_completion()
setup(&data);
Utils::ChangeSet change;
change.insert(data.pos, "c.");
change.insert(data.pos, QLatin1String("c."));
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += 2;
@@ -453,10 +453,10 @@ void CppToolsPlugin::test_completion_template_as_base_data()
" @\n"
" // padding so we get the scope right\n"
"}";
completions.append("Data");
completions.append("dataMember");
completions.append("Other");
completions.append("otherMember");
completions.append(QLatin1String("Data"));
completions.append(QLatin1String("dataMember"));
completions.append(QLatin1String("Other"));
completions.append(QLatin1String("otherMember"));
QTest::newRow("case: base as template directly") << code << completions;
@@ -471,12 +471,12 @@ void CppToolsPlugin::test_completion_template_as_base_data()
" @\n"
" // padding so we get the scope right\n"
"}";
completions.append("Data");
completions.append("dataMember");
completions.append("Other");
completions.append("otherMember");
completions.append("More");
completions.append("moreMember");
completions.append(QLatin1String("Data"));
completions.append(QLatin1String("dataMember"));
completions.append(QLatin1String("Other"));
completions.append(QLatin1String("otherMember"));
completions.append(QLatin1String("More"));
completions.append(QLatin1String("moreMember"));
QTest::newRow("case: base as class template") << code << completions;
@@ -491,12 +491,12 @@ void CppToolsPlugin::test_completion_template_as_base_data()
" @\n"
" // padding so we get the scope right\n"
"}";
completions.append("Data");
completions.append("dataMember");
completions.append("Other");
completions.append("otherMember");
completions.append("More");
completions.append("moreMember");
completions.append(QLatin1String("Data"));
completions.append(QLatin1String("dataMember"));
completions.append(QLatin1String("Other"));
completions.append(QLatin1String("otherMember"));
completions.append(QLatin1String("More"));
completions.append(QLatin1String("moreMember"));
QTest::newRow("case: base as globally qualified class template") << code << completions;
@@ -513,12 +513,12 @@ void CppToolsPlugin::test_completion_template_as_base_data()
" @\n"
" // padding so we get the scope right\n"
"}";
completions.append("Data");
completions.append("dataMember");
completions.append("Other");
completions.append("otherMember");
completions.append("More");
completions.append("moreMember");
completions.append(QLatin1String("Data"));
completions.append(QLatin1String("dataMember"));
completions.append(QLatin1String("Other"));
completions.append(QLatin1String("otherMember"));
completions.append(QLatin1String("More"));
completions.append(QLatin1String("moreMember"));
QTest::newRow("case: base as namespace qualified class template") << code << completions;
@@ -535,10 +535,10 @@ void CppToolsPlugin::test_completion_template_as_base_data()
" @\n"
" // padding so we get the scope right\n"
"}";
completions.append("Data");
completions.append("dataMember");
completions.append("Final");
completions.append("finalMember");
completions.append(QLatin1String("Data"));
completions.append(QLatin1String("dataMember"));
completions.append(QLatin1String("Final"));
completions.append(QLatin1String("finalMember"));
QTest::newRow("case: base as nested template name") << code << completions;
@@ -555,10 +555,10 @@ void CppToolsPlugin::test_completion_template_as_base_data()
" @\n"
" // padding so we get the scope right\n"
"}";
completions.append("Data");
completions.append("dataMember");
completions.append("Final");
completions.append("finalMember");
completions.append(QLatin1String("Data"));
completions.append(QLatin1String("dataMember"));
completions.append(QLatin1String("Final"));
completions.append(QLatin1String("finalMember"));
QTest::newRow("case: base as nested template name in non-template") << code << completions;
completions.clear();
@@ -574,12 +574,12 @@ void CppToolsPlugin::test_completion_template_as_base_data()
" @\n"
" // padding so we get the scope right\n"
"}";
completions.append("Data");
completions.append("dataMember");
completions.append("Final");
completions.append("finalMember");
completions.append("Other");
completions.append("otherMember");
completions.append(QLatin1String("Data"));
completions.append(QLatin1String("dataMember"));
completions.append(QLatin1String("Final"));
completions.append(QLatin1String("finalMember"));
completions.append(QLatin1String("Other"));
completions.append(QLatin1String("otherMember"));
QTest::newRow("case: base as template name in non-template") << code << completions;
}
@@ -611,10 +611,10 @@ void CppToolsPlugin::test_completion_use_global_identifier_as_base_class_data()
"@\n"
"// padding so we get the scope right\n";
completions.append("int_global");
completions.append("int_final");
completions.append("Final");
completions.append("Global");
completions.append(QLatin1String("int_global"));
completions.append(QLatin1String("int_final"));
completions.append(QLatin1String("Final"));
completions.append(QLatin1String("Global"));
QTest::newRow("case: derived as global and base as global") << code << completions;
completions.clear();
@@ -637,10 +637,10 @@ void CppToolsPlugin::test_completion_use_global_identifier_as_base_class_data()
"@\n"
"// padding so we get the scope right\n";
completions.append("int_global");
completions.append("int_final");
completions.append("Final");
completions.append("Global");
completions.append(QLatin1String("int_global"));
completions.append(QLatin1String("int_final"));
completions.append(QLatin1String("Final"));
completions.append(QLatin1String("Global"));
QTest::newRow("case: derived is inside namespace, base as global")
<< code << completions;
@@ -668,10 +668,10 @@ void CppToolsPlugin::test_completion_use_global_identifier_as_base_class_data()
// "@\n"
// "// padding so we get the scope right\n";
// completions.append("int_global");
// completions.append("int_final");
// completions.append("Final");
// completions.append("Global");
// completions.append(QLatin1String("int_global"));
// completions.append(QLatin1String("int_final"));
// completions.append(QLatin1String("Final"));
// completions.append(QLatin1String("Global"));
// QTest::newRow("case: derived is enclosed by template, base as global")
// << code << completions;
@@ -701,8 +701,8 @@ void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived_dat
"@\n"
"// padding so we get the scope right\n";
completions.append("int_a");
completions.append("A");
completions.append(QLatin1String("int_a"));
completions.append(QLatin1String("A"));
QTest::newRow("case: base class is derived class") << code << completions;
completions.clear();
@@ -720,8 +720,8 @@ void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived_dat
"@\n"
"// padding so we get the scope right\n";
completions.append("int_a");
completions.append("A");
completions.append(QLatin1String("int_a"));
completions.append(QLatin1String("A"));
QTest::newRow("case: base class is derived class. class is in namespace")
<< code << completions;
@@ -740,8 +740,8 @@ void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived_dat
"@\n"
"// padding so we get the scope right\n";
completions.append("int_a");
completions.append("A");
completions.append(QLatin1String("int_a"));
completions.append(QLatin1String("A"));
QTest::newRow("case: base class is derived class. class is in namespace. "
"use scope operator for base class") << code << completions;
@@ -767,9 +767,9 @@ void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived_dat
"@\n"
"// padding so we get the scope right\n";
completions.append("int_ns1_a");
completions.append("int_ns2_a");
completions.append("A");
completions.append(QLatin1String("int_ns1_a"));
completions.append(QLatin1String("int_ns2_a"));
completions.append(QLatin1String("A"));
QTest::newRow("case: base class has the same name as derived but in different namespace")
<< code << completions;
@@ -795,9 +795,9 @@ void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived_dat
"@\n"
"// padding so we get the scope right\n";
completions.append("int_enclosing_a");
completions.append("int_ns2_a");
completions.append("A");
completions.append(QLatin1String("int_enclosing_a"));
completions.append(QLatin1String("int_ns2_a"));
completions.append(QLatin1String("A"));
QTest::newRow("case: base class has the same name as derived(in namespace) "
"but is nested by different class") << code << completions;
@@ -823,9 +823,9 @@ void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived_dat
"@\n"
"// padding so we get the scope right\n";
completions.append("int_enclosing_base_a");
completions.append("int_enclosing_derived_a");
completions.append("A");
completions.append(QLatin1String("int_enclosing_base_a"));
completions.append(QLatin1String("int_enclosing_derived_a"));
completions.append(QLatin1String("A"));
QTest::newRow("case: base class has the same name as derived(nested) "
"but is nested by different class") << code << completions;
@@ -842,8 +842,8 @@ void CppToolsPlugin::test_completion_base_class_has_name_the_same_as_derived_dat
"@\n"
"// padding so we get the scope right\n";
completions.append("int_a");
completions.append("A");
completions.append(QLatin1String("int_a"));
completions.append(QLatin1String("A"));
QTest::newRow("case: base class is derived class. class is a template")
<< code << completions;
@@ -872,10 +872,10 @@ void CppToolsPlugin::test_completion_cyclic_inheritance_data()
"A c;\n"
"@\n"
;
completions.append("A");
completions.append("_a");
completions.append("B");
completions.append("_b");
completions.append(QLatin1String("A"));
completions.append(QLatin1String("_a"));
completions.append(QLatin1String("B"));
completions.append(QLatin1String("_b"));
QTest::newRow("case: direct cyclic inheritance") << code << completions;
completions.clear();
@@ -888,12 +888,12 @@ void CppToolsPlugin::test_completion_cyclic_inheritance_data()
"A c;\n"
"@\n"
;
completions.append("A");
completions.append("_a");
completions.append("B");
completions.append("_b");
completions.append("C");
completions.append("_c");
completions.append(QLatin1String("A"));
completions.append(QLatin1String("_a"));
completions.append(QLatin1String("B"));
completions.append(QLatin1String("_b"));
completions.append(QLatin1String("C"));
completions.append(QLatin1String("_c"));
QTest::newRow("case: indirect cyclic inheritance") << code << completions;
completions.clear();
@@ -906,12 +906,12 @@ void CppToolsPlugin::test_completion_cyclic_inheritance_data()
"A c;\n"
"@\n"
;
completions.append("A");
completions.append("_a");
completions.append("B");
completions.append("_b");
completions.append("C");
completions.append("_c");
completions.append(QLatin1String("A"));
completions.append(QLatin1String("_a"));
completions.append(QLatin1String("B"));
completions.append(QLatin1String("_b"));
completions.append(QLatin1String("C"));
completions.append(QLatin1String("_c"));
QTest::newRow("case: indirect cyclic inheritance") << code << completions;
completions.clear();
@@ -930,11 +930,11 @@ void CppToolsPlugin::test_completion_cyclic_inheritance_data()
"D<int, float> c;\n"
"@\n"
;
completions.append("D");
completions.append("_d_t");
completions.append("_d_s");
completions.append("C");
completions.append("_c_t");
completions.append(QLatin1String("D"));
completions.append(QLatin1String("_d_t"));
completions.append(QLatin1String("_d_s"));
completions.append(QLatin1String("C"));
completions.append(QLatin1String("_c_t"));
QTest::newRow("case: direct cyclic inheritance with templates")
<< code << completions;
@@ -958,13 +958,13 @@ void CppToolsPlugin::test_completion_cyclic_inheritance_data()
"D<int, float> c;\n"
"@\n"
;
completions.append("D");
completions.append("_d_t");
completions.append("_d_s");
completions.append("C");
completions.append("_c_t");
completions.append("B");
completions.append("_b_t");
completions.append(QLatin1String("D"));
completions.append(QLatin1String("_d_t"));
completions.append(QLatin1String("_d_s"));
completions.append(QLatin1String("C"));
completions.append(QLatin1String("_c_t"));
completions.append(QLatin1String("B"));
completions.append(QLatin1String("_b_t"));
QTest::newRow("case: indirect cyclic inheritance with templates")
<< code << completions;
@@ -998,11 +998,11 @@ void CppToolsPlugin::test_completion_cyclic_inheritance_data()
"Class<int> c;\n"
"@\n"
;
completions.append("Class");
completions.append("ClassRecurse");
completions.append("class_t");
completions.append("class_recurse_s");
completions.append("class_recurse_t");
completions.append(QLatin1String("Class"));
completions.append(QLatin1String("ClassRecurse"));
completions.append(QLatin1String("class_t"));
completions.append(QLatin1String("class_recurse_s"));
completions.append(QLatin1String("class_recurse_t"));
QTest::newRow("case: direct cyclic inheritance with templates, more complex situation")
<< code << completions;
}
@@ -1030,8 +1030,8 @@ void CppToolsPlugin::test_completion_enclosing_template_class_data()
"\n"
"Enclosing<int>::Nested c;"
"@\n";
completions.append("Nested");
completions.append("int_nested");
completions.append(QLatin1String("Nested"));
completions.append(QLatin1String("int_nested"));
QTest::newRow("case: nested class with enclosing template class")
<< code << completions;
@@ -1047,8 +1047,8 @@ void CppToolsPlugin::test_completion_enclosing_template_class_data()
"\n"
"Enclosing<int>::Nested<int> c;"
"@\n";
completions.append("Nested");
completions.append("int_nested");
completions.append(QLatin1String("Nested"));
completions.append(QLatin1String("int_nested"));
QTest::newRow("case: nested template class with enclosing template class")
<< code << completions;