hrev51166 adds 1 changeset to branch 'master'
old head: 221b77b6ac11acadaca8ae672e9df7c101ce7cd1
new head: 0c28e8e5a05e7d67c3ceb391ae7bb4298e0bb624
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=0c28e8e5a05e+%5E221b77b6ac11
----------------------------------------------------------------------------
0c28e8e5a05e: Implementation of JSON Streaming Parser
Fix warnings related to x86_64 tests' compilation.
[ Andrew Lindesay <apl@xxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51166
Commit: 0c28e8e5a05e7d67c3ceb391ae7bb4298e0bb624
URL: http://cgit.haiku-os.org/haiku/commit/?id=0c28e8e5a05e
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Sat May 13 22:44:03 2017 UTC
----------------------------------------------------------------------------
5 files changed, 8 insertions(+), 12 deletions(-)
src/tests/kits/shared/JsonEndToEndTest.cpp | 2 +-
src/tests/kits/shared/JsonEndToEndTest.h | 4 ++--
src/tests/kits/shared/JsonErrorHandlingTest.cpp | 6 +-----
src/tests/kits/shared/JsonTextWriterTest.cpp | 6 +++---
src/tests/kits/shared/JsonToMessageTest.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/tests/kits/shared/JsonEndToEndTest.cpp
b/src/tests/kits/shared/JsonEndToEndTest.cpp
index 061504b..4f7d9fe 100644
--- a/src/tests/kits/shared/JsonEndToEndTest.cpp
+++ b/src/tests/kits/shared/JsonEndToEndTest.cpp
@@ -29,7 +29,7 @@ JsonEndToEndTest::~JsonEndToEndTest()
void
-JsonEndToEndTest::TestParseAndWrite(char* input, char* expectedOutput)
+JsonEndToEndTest::TestParseAndWrite(const char* input, const char*
expectedOutput)
{
BDataIO* inputData = new BMemoryIO(input, strlen(input));
ObjectDeleter<BDataIO> inputDataDeleter(inputData);
diff --git a/src/tests/kits/shared/JsonEndToEndTest.h
b/src/tests/kits/shared/JsonEndToEndTest.h
index 07b9712..cd53648 100644
--- a/src/tests/kits/shared/JsonEndToEndTest.h
+++ b/src/tests/kits/shared/JsonEndToEndTest.h
@@ -37,8 +37,8 @@ public:
private:
void TestUnterminated(const
char* input);
- void TestParseAndWrite(char*
input,
- char*
expectedOutput);
+ void TestParseAndWrite(const
char* input,
+ const
char* expectedOutput);
};
diff --git a/src/tests/kits/shared/JsonErrorHandlingTest.cpp
b/src/tests/kits/shared/JsonErrorHandlingTest.cpp
index 6c54e38..1e97505 100644
--- a/src/tests/kits/shared/JsonErrorHandlingTest.cpp
+++ b/src/tests/kits/shared/JsonErrorHandlingTest.cpp
@@ -301,12 +301,8 @@ JsonErrorHandlingTest::TestBadStringEscape()
void
JsonErrorHandlingTest::TestBadNumber()
{
- BString expectedMessage;
- expectedMessage.SetToFormat("malformed number",
- JSON_SAMPLE_BROKEN_NUMBER);
-
TestParseWithErrorMessage(JSON_SAMPLE_BROKEN_NUMBER, 1, B_BAD_DATA,
- expectedMessage.String());
+ "malformed number");
}
diff --git a/src/tests/kits/shared/JsonTextWriterTest.cpp
b/src/tests/kits/shared/JsonTextWriterTest.cpp
index 99b427f..91585f9 100644
--- a/src/tests/kits/shared/JsonTextWriterTest.cpp
+++ b/src/tests/kits/shared/JsonTextWriterTest.cpp
@@ -111,7 +111,7 @@ JsonTextWriterTest::TestInteger()
BMallocIO* outputData = new BMallocIO();
ObjectDeleter<BMallocIO> outputDataDeleter(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,
writer.WriteInteger(JSON_SAMPLE_NUMBER_B_LITERAL));
@@ -134,7 +134,7 @@ JsonTextWriterTest::TestDouble()
BMallocIO* outputData = new BMallocIO();
ObjectDeleter<BMallocIO> outputDataDeleter(outputData);
BJsonTextWriter writer(outputData);
- static char* expectedOut = "3.142857";
+ static const char* expectedOut = "3.142857";
CPPUNIT_ASSERT_EQUAL(B_OK,
writer.WriteDouble(JSON_SAMPLE_NUMBER_A_LITERAL));
@@ -157,7 +157,7 @@ JsonTextWriterTest::TestFalse()
BMallocIO* outputData = new BMallocIO();
ObjectDeleter<BMallocIO> outputDataDeleter(outputData);
BJsonTextWriter writer(outputData);
- static char* expectedOut = "false";
+ static const char* expectedOut = "false";
CPPUNIT_ASSERT_EQUAL(B_OK, writer.WriteFalse());
writer.Complete();
diff --git a/src/tests/kits/shared/JsonToMessageTest.cpp
b/src/tests/kits/shared/JsonToMessageTest.cpp
index 9e15371..e257fb4 100644
--- a/src/tests/kits/shared/JsonToMessageTest.cpp
+++ b/src/tests/kits/shared/JsonToMessageTest.cpp
@@ -1,4 +1,4 @@
- /*
+/*
* Copyright 2017, Andrew Lindesay <apl@xxxxxxxxxxxxxx>
* Distributed under the terms of the MIT License.
*/
