Skip to content

Commit 69a9aaf

Browse files
committed
testrunner: renamed givenACodeSampleToTokenize to TokenizedCode
1 parent f177eb3 commit 69a9aaf

File tree

4 files changed

+84
-84
lines changed

4 files changed

+84
-84
lines changed

test/helpers.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ class Token;
3030
class Preprocessor;
3131
class Suppressions;
3232

33-
class givenACodeSampleToTokenize {
33+
class TokenizedCode {
3434
private:
3535
Tokenizer tokenizer;
3636
const Settings settings;
3737

3838
public:
39-
explicit givenACodeSampleToTokenize(const char sample[], bool createOnly = false, bool cpp = true)
39+
explicit TokenizedCode(const char sample[], bool createOnly = false, bool cpp = true)
4040
: tokenizer(&settings, nullptr) {
4141
std::istringstream iss(sample);
4242
if (createOnly)

test/testlibrary.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ class TestLibrary : public TestFixture {
868868
ASSERT_EQUALS(C.arrayLike_indexOp, true);
869869

870870
{
871-
givenACodeSampleToTokenize var("std::A<int> a;");
871+
TokenizedCode var("std::A<int> a;");
872872
ASSERT_EQUALS(&A, library.detectContainer(var.tokens()));
873873
ASSERT(!library.detectIterator(var.tokens()));
874874
bool isIterator;
@@ -877,14 +877,14 @@ class TestLibrary : public TestFixture {
877877
}
878878

879879
{
880-
givenACodeSampleToTokenize var("std::A<int>::size_type a_s;");
880+
TokenizedCode var("std::A<int>::size_type a_s;");
881881
ASSERT(!library.detectContainer(var.tokens()));
882882
ASSERT(!library.detectIterator(var.tokens()));
883883
ASSERT(!library.detectContainerOrIterator(var.tokens()));
884884
}
885885

886886
{
887-
givenACodeSampleToTokenize var("std::A<int>::iterator a_it;");
887+
TokenizedCode var("std::A<int>::iterator a_it;");
888888
ASSERT(!library.detectContainer(var.tokens()));
889889
ASSERT_EQUALS(&A, library.detectIterator(var.tokens()));
890890
bool isIterator;
@@ -893,7 +893,7 @@ class TestLibrary : public TestFixture {
893893
}
894894

895895
{
896-
givenACodeSampleToTokenize var("std::B<int> b;");
896+
TokenizedCode var("std::B<int> b;");
897897
ASSERT_EQUALS(&B, library.detectContainer(var.tokens()));
898898
ASSERT(!library.detectIterator(var.tokens()));
899899
bool isIterator;
@@ -902,14 +902,14 @@ class TestLibrary : public TestFixture {
902902
}
903903

904904
{
905-
givenACodeSampleToTokenize var("std::B<int>::size_type b_s;");
905+
TokenizedCode var("std::B<int>::size_type b_s;");
906906
ASSERT(!library.detectContainer(var.tokens()));
907907
ASSERT(!library.detectIterator(var.tokens()));
908908
ASSERT(!library.detectContainerOrIterator(var.tokens()));
909909
}
910910

911911
{
912-
givenACodeSampleToTokenize var("std::B<int>::iterator b_it;");
912+
TokenizedCode var("std::B<int>::iterator b_it;");
913913
ASSERT(!library.detectContainer(var.tokens()));
914914
ASSERT_EQUALS(&B, library.detectIterator(var.tokens()));
915915
bool isIterator;
@@ -918,14 +918,14 @@ class TestLibrary : public TestFixture {
918918
}
919919

920920
{
921-
givenACodeSampleToTokenize var("C c;");
921+
TokenizedCode var("C c;");
922922
ASSERT(!library.detectContainer(var.tokens()));
923923
ASSERT(!library.detectIterator(var.tokens()));
924924
ASSERT(!library.detectContainerOrIterator(var.tokens()));
925925
}
926926

927927
{
928-
givenACodeSampleToTokenize var("D d;");
928+
TokenizedCode var("D d;");
929929
ASSERT(!library.detectContainer(var.tokens()));
930930
ASSERT(!library.detectIterator(var.tokens()));
931931
ASSERT(!library.detectContainerOrIterator(var.tokens()));

test/testsymboldatabase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ class TestSymbolDatabase : public TestFixture {
744744
}
745745
{
746746
reset();
747-
givenACodeSampleToTokenize constpointer("const int* p;");
747+
TokenizedCode constpointer("const int* p;");
748748
Variable v2(constpointer.tokens()->tokAt(3), constpointer.tokens()->next(), constpointer.tokens()->tokAt(2), 0, AccessControl::Public, nullptr, nullptr, &settings1);
749749
ASSERT(false == v2.isArray());
750750
ASSERT(true == v2.isPointer());

0 commit comments

Comments
 (0)