summaryrefslogtreecommitdiff
path: root/packages/fcl-json
diff options
context:
space:
mode:
authormichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2010-05-28 11:20:01 +0000
committermichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2010-05-28 11:20:01 +0000
commite3690917c195e4e151d5471f1c36d91d0d8e53cd (patch)
tree60c70cf47af47f653c3b22631e842937e79fa4b5 /packages/fcl-json
parent05176adbd255fad98e73ef5bea76ee1f1cf60c61 (diff)
downloadfpc-e3690917c195e4e151d5471f1c36d91d0d8e53cd.tar.gz
Null -> null (B*y case sensitive languages)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15342 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-json')
-rw-r--r--packages/fcl-json/src/fpjson.pp2
-rw-r--r--packages/fcl-json/tests/testjsondata.pp6
-rw-r--r--packages/fcl-json/tests/testjsonparser.pp10
3 files changed, 9 insertions, 9 deletions
diff --git a/packages/fcl-json/src/fpjson.pp b/packages/fcl-json/src/fpjson.pp
index b616a512b4..caf6ac678b 100644
--- a/packages/fcl-json/src/fpjson.pp
+++ b/packages/fcl-json/src/fpjson.pp
@@ -795,7 +795,7 @@ end;
function TJSONnull.GetAsJSON: TJSONStringType;
begin
- Result:='Null';
+ Result:='null';
end;
function TJSONnull.GetAsString: TJSONStringType;
diff --git a/packages/fcl-json/tests/testjsondata.pp b/packages/fcl-json/tests/testjsondata.pp
index e158609185..cfc189561f 100644
--- a/packages/fcl-json/tests/testjsondata.pp
+++ b/packages/fcl-json/tests/testjsondata.pp
@@ -461,7 +461,7 @@ begin
try
TestJSONType(J,jtNull);
TestItemCount(J,0);
- TestJSON(J,'Null');
+ TestJSON(J,'null');
TestIsNull(J,True);
TestAsBoolean(J,False,True);
TestAsInteger(J,0,true);
@@ -1292,7 +1292,7 @@ begin
AssertEquals('J[0] is TJSONNull',TJSONNull,J[0].ClassType);
AssertEquals('J.Nulls[0]=True',True,J.Nulls[0]);
TestIsNull(J[0],true);
- TestJSON(J,'[Null]');
+ TestJSON(J,'[null]');
finally
FreeAndNil(J);
end;
@@ -1621,7 +1621,7 @@ begin
AssertEquals('J[''a''] is TJSONNull',TJSONNull,J[A].ClassType);
AssertEquals('J.Nulls[''a'']=True',True,J.Nulls[A]);
TestIsNull(J[a],true);
- TestJSON(J,'{ "'+a+'" : Null }');
+ TestJSON(J,'{ "'+a+'" : null }');
finally
FreeAndNil(J);
end;
diff --git a/packages/fcl-json/tests/testjsonparser.pp b/packages/fcl-json/tests/testjsonparser.pp
index 0877a7906c..46b1579b61 100644
--- a/packages/fcl-json/tests/testjsonparser.pp
+++ b/packages/fcl-json/tests/testjsonparser.pp
@@ -116,11 +116,11 @@ Var
J : TJSONData;
begin
- P:=TJSONParser.Create('Null');
+ P:=TJSONParser.Create('null');
Try
J:=P.Parse;
If (J=Nil) then
- Fail('Parse of Null fails');
+ Fail('Parse of null fails');
TestJSONType(J,jtNull);
Finally
FreeAndNil(J);
@@ -200,7 +200,7 @@ Var
begin
DoTestArray('[]',0);
- DoTestArray('[Null]',1);
+ DoTestArray('[null]',1);
DoTestArray('[true]',1);
DoTestArray('[false]',1);
DoTestArray('[1]',1);
@@ -218,9 +218,9 @@ begin
DoTestArray('["A string"]',1);
DoTestArray('["A string", "Another string"]',2);
DoTestArray('["A string", "Another string", "Yet another string"]',3);
- DoTestArray('[Null, false]',2);
+ DoTestArray('[null, false]',2);
DoTestArray('[true, false]',2);
- DoTestArray('[Null, 1]',2);
+ DoTestArray('[null, 1]',2);
DoTestArray('[1, "A string"]',2);
DoTestArray('[1, []]',2);
DoTestArray('[1, [1, 2]]',2);