diff options
| author | michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2010-08-19 17:04:05 +0000 |
|---|---|---|
| committer | michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2010-08-19 17:04:05 +0000 |
| commit | e9ec1ce5d8e4aefb520ec244373e1841971d22b6 (patch) | |
| tree | d11d193e080c0009cc534fa30012c667dcffbd2f /packages/fcl-json | |
| parent | 12c5a85ad92d86d073542c82afa53302027f8327 (diff) | |
| download | fpc-e9ec1ce5d8e4aefb520ec244373e1841971d22b6.tar.gz | |
* Patch from Luiz Americo to fix TJSONBoolean.AsString, also fixed testcases
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15854 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-json')
| -rw-r--r-- | packages/fcl-json/src/fpjson.pp | 2 | ||||
| -rw-r--r-- | packages/fcl-json/tests/testjson.lpi | 9 | ||||
| -rw-r--r-- | packages/fcl-json/tests/testjsondata.pp | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/packages/fcl-json/src/fpjson.pp b/packages/fcl-json/src/fpjson.pp index 357ce86a6d..e8b6415df6 100644 --- a/packages/fcl-json/src/fpjson.pp +++ b/packages/fcl-json/src/fpjson.pp @@ -724,7 +724,7 @@ end; function TJSONboolean.GetAsString: TJSONStringType; begin - Result:=BoolToStr(FValue); + Result:=BoolToStr(FValue, True); end; procedure TJSONboolean.SetAsString(const AValue: TJSONStringType); diff --git a/packages/fcl-json/tests/testjson.lpi b/packages/fcl-json/tests/testjson.lpi index 91b7ccebf1..601c243740 100644 --- a/packages/fcl-json/tests/testjson.lpi +++ b/packages/fcl-json/tests/testjson.lpi @@ -1,7 +1,7 @@ <?xml version="1.0"?> <CONFIG> <ProjectOptions> - <Version Value="7"/> + <Version Value="8"/> <General> <Flags> <LRSInOutputDirectory Value="False"/> @@ -58,10 +58,15 @@ </Units> </ProjectOptions> <CompilerOptions> - <Version Value="8"/> + <Version Value="9"/> <SearchPaths> <OtherUnitFiles Value="../src/"/> </SearchPaths> + <Parsing> + <SyntaxOptions> + <UseAnsiStrings Value="False"/> + </SyntaxOptions> + </Parsing> <Other> <CompilerPath Value="$(CompPath)"/> </Other> diff --git a/packages/fcl-json/tests/testjsondata.pp b/packages/fcl-json/tests/testjsondata.pp index 3e7fbe3a90..2a0a886f03 100644 --- a/packages/fcl-json/tests/testjsondata.pp +++ b/packages/fcl-json/tests/testjsondata.pp @@ -399,7 +399,7 @@ begin TestAsBoolean(J,True); TestAsInteger(J,1); TestAsInt64(J,1); - TestAsString(J,BoolToStr(True)); + TestAsString(J,BoolToStr(True,True)); TestAsFloat(J,1.0); finally FreeAndNil(J); @@ -421,7 +421,7 @@ begin TestAsBoolean(J,False); TestAsInteger(J,0); TestAsInt64(J,0); - TestAsString(J,BoolToStr(False)); + TestAsString(J,BoolToStr(False,True)); TestAsFloat(J,0.0); finally FreeAndNil(J); |