summaryrefslogtreecommitdiffstats
path: root/json
Commit message (Collapse)AuthorAgeFilesLines
* Skip byte order mark (BOM) in org.jsonJesse Wilson2011-07-202-0/+16
| | | | | Bug: http://code.google.com/p/android/issues/detail?id=18508 Change-Id: Ib992a0a4b22e340446abab14e4f32df5efcd0b49
* Fix string to boolean coercsion.Jesse Wilson2011-07-087-15/+45
| | | | | | | | | | When we reimplemented this API I broke consistency with org.json. Bringing it back into line makes the implementation more strict (my preference) and makes us consistent with ourselves before this code was redone. Bug: http://code.google.com/p/android/issues/detail?id=16411 Change-Id: I8c1b52e382ad91932d3cf9a5b346db58df4da7c6
* Comments/javadoc should be in en_US, not en_CA.Elliott Hughes2010-12-031-1/+1
| | | | Change-Id: Ie9dde4971e0a6a8dadd14af43d631158fc488cd8
* Sorting imports.Jesse Wilson2010-08-115-11/+19
| | | | Change-Id: I8347bc625480a1c37a1ed9976193ddfedeb00bbc
* Scrubbing broken tests and removing unnecessary organization AllTests.java ↵Jesse Wilson2010-06-041-33/+0
| | | | | | | | | | | | | | | files. I've deleted as many tests as possible that duplicated coverage in Harmony. We're now running their tests directly against our codebase and having two copies of every test is quite painful; particularly when the tests need maintenance. The AllTests files aren't necessary, our test harness can automatically find tests and run them without external organization. This strategy is also more reliable, since often the AllTests files are out of sync. Change-Id: I3ee052f8839e9b146ba47f945812f5937d878110
* Remove all trailing whitespace from the dalvik team-maintained parts of libcore.Elliott Hughes2010-05-135-7/+7
| | | | | | Gentlemen, you may now set your editors to "strip trailing whitespace"... Change-Id: I85b2f6c80e5fbef1af6cab11789790b078c11b1b
* Adding support for hash '#' comments to our JSON parser.Jesse Wilson2010-04-063-30/+70
| | | | | | | | | | Neither the JSON RFC nor the documentation of Crockford's implementation mention these comments, but somehow the old parser used to support these. And so we shall also. See bug 2571423. Change-Id: I77d64c5ec53278d8df5fe1873404f1241320504b
* Test and document our handling of nulls with getString().Jesse Wilson2010-03-252-1/+26
| | | | | | | | | | Our behaviour is consistent with Crockford's. The test confirms that the behaviour is consistent with the report of that bug, which the submitter claims is not how it should behave. http://code.google.com/p/android/issues/detail?id=7257 Change-Id: Ibace4bd995e3cbc8fb6c9dc509f8f4491865a647
* Drop needless parens from Javadoc.Jesse Wilson2010-03-184-14/+14
| | | | | | | Although this violates my longstanding style preference, it agrees with almighty JJB's official ArrayList, which is Good Enough For Me. Change-Id: I7b608c12e04d0b7789bfcabeab4b7347ad22baca
* Javadoc for JSONArray.Jesse Wilson2010-03-182-24/+290
| | | | Change-Id: I3aced2607b48210f76887e0d42b591c098ce5db7
* Merge "Javadocs for JSONObject."Jesse Wilson2010-03-173-7/+374
|\
| * Javadocs for JSONObject.Jesse Wilson2010-03-173-7/+374
| | | | | | | | Change-Id: I5ec9df6a3a9baac8f4f498890cd35feff774737a
* | Fixing an @link issue that is upsetting DroidDoc.Jesse Wilson2010-03-161-4/+4
|/ | | | Change-Id: I9837cfd46684ac6d5b9ec4ac6809da3c3f61d57d
* First half of JSON Javadocs.Jesse Wilson2010-03-163-19/+214
| | | | Change-Id: I277ec3b35a28802dd7b7f82c1f4bbadbd3cc4c65
* Adding an Apache-licensed implementation of org.jsonJesse Wilson2010-03-126-0/+0
| | | | Change-Id: I1b67bac70bd25220a619e6ebe61f7f1c6f316faa
* Removing the non-free org.json implementationJesse Wilson2010-03-125-2662/+0
| | | | Change-Id: Ife53082824f5916665f198d4b2fb863271841ce0
* A cleanroom implementation of the org.json API.Jesse Wilson2010-03-1213-161/+2362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implementation lacks documentation. I intend to write that after checking it into the master branch. By not waiting we'll have more time to exercise the code, if only in Google's own applications. This passes all of my tests. I rewrote some of the tests to make Crockford's implementation fail. The tests that fail on Crockford's implementation are: JSONArrayTest testEqualsAndHashCode equals() not consistent with hashCode() testTokenerConstructorParseFail StackOverflowError testStringConstructorParseFail StackOverflowError JSONObjectTest testOtherNumbers Object.put() accepted a NaN (via a custom Number class) testMapConstructorWithBogusEntries JSONObject constructor doesn't validate its input! JSONTokenerTest testNextNWithAllRemaining off-by-one error? testNext0 Returning an empty string should be valid testNextCleanCommentsTrailingSingleSlash nextClean doesn't consume a trailing slash assertNotClean The character line tabulation is not whitespace according to the JSON spec. testNextToDoesntStopOnNull nextTo() shouldn't stop after \0 characters testNextToConsumesNull nextTo shouldn't consume \0. testSkipToStopsOnNull skipTo shouldn't stop when it sees '\0' ParsingTest testParsingLargeHexValues For input "0x80000000" Hex values are parsed as Strings if their signed value is greater than Integer.MAX_VALUE. testSyntaxProblemUnterminatedArray Stack overflowed on input "[" Change-Id: I44c4a4a698a66bf043ed339d6bd804951e732cbf
* New tests for JSONObject and for JSON's self-use.Jesse Wilson2010-03-105-7/+1090
| | | | | | | | | Alongside development of these tests, I'm working on a new cleanroom implementation. The self use test was written to prevent me from self-using in a way that the original implementation does not. Change-Id: Ie617aca1978bd39d85b05e5c2c7bd657ed159dd6
* Fixing packages for JSON testsJesse Wilson2010-02-173-14/+3
|
* First round of tests for the subset of the org.json in Android.Jesse Wilson2010-02-174-0/+1301
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-036-0/+2662
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-036-2662/+0
|
* Initial ContributionThe Android Open Source Project2008-10-216-0/+2662