Skip to content

Commit 078e0d7

Browse files
jacobsajacobsa
committed
Gave tests more general names in preparation for making them much more
comprehensive.
1 parent fee49b1 commit 078e0d7

1 file changed

Lines changed: 27 additions & 35 deletions

File tree

‎src/test_lib_json/main.cpp‎

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ struct ValueTest : JsonTest::TestCase
9595
};
9696

9797

98-
JSONTEST_FIXTURE( ValueTest, size )
98+
JSONTEST_FIXTURE( ValueTest, memberCount )
9999
{
100100
JSONTEST_ASSERT_PRED( checkMemberCount(emptyArray_, 0) );
101101
JSONTEST_ASSERT_PRED( checkMemberCount(emptyObject_, 0) );
@@ -112,7 +112,7 @@ JSONTEST_FIXTURE( ValueTest, size )
112112
}
113113

114114

115-
JSONTEST_FIXTURE( ValueTest, objectTypes )
115+
JSONTEST_FIXTURE( ValueTest, objects )
116116
{
117117
IsCheck checks;
118118
checks.isObject_ = true;
@@ -121,16 +121,27 @@ JSONTEST_FIXTURE( ValueTest, objectTypes )
121121
}
122122

123123

124-
JSONTEST_FIXTURE( ValueTest, arrayTypes )
124+
JSONTEST_FIXTURE( ValueTest, arrays )
125125
{
126+
// Types
126127
IsCheck checks;
127128
checks.isArray_ = true;
128129
JSONTEST_ASSERT_PRED( checkIs( emptyArray_, checks ) );
129130
JSONTEST_ASSERT_PRED( checkIs( array1_, checks ) );
131+
132+
// Access non-const array
133+
const unsigned int index0 = 0;
134+
JSONTEST_ASSERT( Json::Value(1234) == array1_[index0] );
135+
JSONTEST_ASSERT( Json::Value(1234) == array1_[0] );
136+
137+
// Access const array
138+
const Json::Value &constArray = array1_;
139+
JSONTEST_ASSERT( Json::Value(1234) == constArray[index0] );
140+
JSONTEST_ASSERT( Json::Value(1234) == constArray[0] );
130141
}
131142

132143

133-
JSONTEST_FIXTURE( ValueTest, nullTypes )
144+
JSONTEST_FIXTURE( ValueTest, null )
134145
{
135146
IsCheck checks;
136147
checks.isNull_ = true;
@@ -140,7 +151,7 @@ JSONTEST_FIXTURE( ValueTest, nullTypes )
140151
}
141152

142153

143-
JSONTEST_FIXTURE( ValueTest, stringTypes )
154+
JSONTEST_FIXTURE( ValueTest, strings )
144155
{
145156
IsCheck checks;
146157
checks.isString_ = true;
@@ -150,7 +161,7 @@ JSONTEST_FIXTURE( ValueTest, stringTypes )
150161
}
151162

152163

153-
JSONTEST_FIXTURE( ValueTest, boolTypes )
164+
JSONTEST_FIXTURE( ValueTest, bools )
154165
{
155166
IsCheck checks;
156167
checks.isBool_ = true;
@@ -161,7 +172,7 @@ JSONTEST_FIXTURE( ValueTest, boolTypes )
161172
}
162173

163174

164-
JSONTEST_FIXTURE( ValueTest, integerTypes )
175+
JSONTEST_FIXTURE( ValueTest, integers )
165176
{
166177
IsCheck checks;
167178

@@ -264,7 +275,7 @@ JSONTEST_FIXTURE( ValueTest, integerTypes )
264275
}
265276

266277

267-
JSONTEST_FIXTURE( ValueTest, nonIntegerTypes )
278+
JSONTEST_FIXTURE( ValueTest, nonIntegers )
268279
{
269280
IsCheck checks;
270281
checks.isDouble_ = true;
@@ -278,23 +289,6 @@ JSONTEST_FIXTURE( ValueTest, nonIntegerTypes )
278289
}
279290

280291

281-
JSONTEST_FIXTURE( ValueTest, accessArray )
282-
{
283-
const unsigned int index0 = 0;
284-
JSONTEST_ASSERT( Json::Value(1234) == array1_[index0] ) << "Json::Value::operator[ArrayIndex]";
285-
JSONTEST_ASSERT( Json::Value(1234) == array1_[0] ) << "Json::Value::operator[int]";
286-
287-
const Json::Value &constArray = array1_;
288-
JSONTEST_ASSERT( Json::Value(1234) == constArray[index0] ) << "Json::Value::operator[ArrayIndex] const";
289-
JSONTEST_ASSERT( Json::Value(1234) == constArray[0] ) << "Json::Value::operator[int] const";
290-
}
291-
292-
293-
JSONTEST_FIXTURE( ValueTest, asFloat )
294-
{
295-
JSONTEST_ASSERT_EQUAL( 0.00390625f, float_.asFloat() ) << "Json::Value::asFloat()";
296-
}
297-
298292
void
299293
ValueTest::checkConstMemberCount( const Json::Value &value, unsigned int expectedCount )
300294
{
@@ -504,16 +498,14 @@ ValueTest::checkIsEqual( const Json::Value &x, const Json::Value &y )
504498
int main( int argc, const char *argv[] )
505499
{
506500
JsonTest::Runner runner;
507-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, size );
508-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, objectTypes );
509-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, arrayTypes );
510-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, boolTypes );
511-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, integerTypes );
512-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, nonIntegerTypes );
513-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, stringTypes );
514-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, nullTypes );
515-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, accessArray );
516-
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, asFloat );
501+
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, memberCount );
502+
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, objects );
503+
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, arrays );
504+
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, null );
505+
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, strings );
506+
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, bools );
507+
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, integers );
508+
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, nonIntegers );
517509
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareNull );
518510
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareInt );
519511
JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareUInt );

0 commit comments

Comments
 (0)