i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implementation of JSON Streaming Parser

Browse Source 
Fix warnings related to x86_64 tests' compilation.
This commit is contained in:
Andrew Lindesay
2017-05-14 10:44:03 +12:00
parent 221b77b6ac
commit 0c28e8e5a0
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kits/shared/JsonEndToEndTest.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ JsonEndToEndTest::~JsonEndToEndTest()
void void
JsonEndToEndTest::TestParseAndWrite(char* input, char* expectedOutput) JsonEndToEndTest::TestParseAndWrite(const char* input, const char* expectedOutput)
{ {
BDataIO* inputData = new BMemoryIO(input, strlen(input)); BDataIO* inputData = new BMemoryIO(input, strlen(input));
ObjectDeleter<BDataIO> inputDataDeleter(inputData); ObjectDeleter<BDataIO> inputDataDeleter(inputData);
src/tests/kits/shared/JsonEndToEndTest.h
+2 -2
View File
@@ -37,8 +37,8 @@ public:
private: private:
void TestUnterminated(const char* input); void TestUnterminated(const char* input);
void TestParseAndWrite(char* input, void TestParseAndWrite(const char* input,
char* expectedOutput); const char* expectedOutput);
}; };
src/tests/kits/shared/JsonErrorHandlingTest.cpp
+1 -5
View File
@@ -301,12 +301,8 @@ JsonErrorHandlingTest::TestBadStringEscape()
void void
JsonErrorHandlingTest::TestBadNumber() JsonErrorHandlingTest::TestBadNumber()
{ {
BString expectedMessage;
expectedMessage.SetToFormat("malformed number",
JSON_SAMPLE_BROKEN_NUMBER);
TestParseWithErrorMessage(JSON_SAMPLE_BROKEN_NUMBER, 1, B_BAD_DATA, TestParseWithErrorMessage(JSON_SAMPLE_BROKEN_NUMBER, 1, B_BAD_DATA,
expectedMessage.String()); "malformed number");
} }
src/tests/kits/shared/JsonTextWriterTest.cpp
+3 -3
View File
@@ -111,7 +111,7 @@ JsonTextWriterTest::TestInteger()
BMallocIO* outputData = new BMallocIO(); BMallocIO* outputData = new BMallocIO();
ObjectDeleter<BMallocIO> outputDataDeleter(outputData); ObjectDeleter<BMallocIO> outputDataDeleter(outputData);
BJsonTextWriter writer(outputData); BJsonTextWriter writer(outputData);
static char* expectedOut = JSON_SAMPLE_NUMBER_B_EXPECTED_OUT; static const char* expectedOut = JSON_SAMPLE_NUMBER_B_EXPECTED_OUT;
CPPUNIT_ASSERT_EQUAL(B_OK, CPPUNIT_ASSERT_EQUAL(B_OK,
writer.WriteInteger(JSON_SAMPLE_NUMBER_B_LITERAL)); writer.WriteInteger(JSON_SAMPLE_NUMBER_B_LITERAL));
@@ -134,7 +134,7 @@ JsonTextWriterTest::TestDouble()
BMallocIO* outputData = new BMallocIO(); BMallocIO* outputData = new BMallocIO();
ObjectDeleter<BMallocIO> outputDataDeleter(outputData); ObjectDeleter<BMallocIO> outputDataDeleter(outputData);
BJsonTextWriter writer(outputData); BJsonTextWriter writer(outputData);
static char* expectedOut = "3.142857"; static const char* expectedOut = "3.142857";
CPPUNIT_ASSERT_EQUAL(B_OK, CPPUNIT_ASSERT_EQUAL(B_OK,
writer.WriteDouble(JSON_SAMPLE_NUMBER_A_LITERAL)); writer.WriteDouble(JSON_SAMPLE_NUMBER_A_LITERAL));
@@ -157,7 +157,7 @@ JsonTextWriterTest::TestFalse()
BMallocIO* outputData = new BMallocIO(); BMallocIO* outputData = new BMallocIO();
ObjectDeleter<BMallocIO> outputDataDeleter(outputData); ObjectDeleter<BMallocIO> outputDataDeleter(outputData);
BJsonTextWriter writer(outputData); BJsonTextWriter writer(outputData);
static char* expectedOut = "false"; static const char* expectedOut = "false";
CPPUNIT_ASSERT_EQUAL(B_OK, writer.WriteFalse()); CPPUNIT_ASSERT_EQUAL(B_OK, writer.WriteFalse());
writer.Complete(); writer.Complete();