Commit Graph

1027 Commits

Author SHA1 Message Date
John J. Aylward 8bae09f81b removes unnecessary comparison to true 2016-08-09 16:11:46 -04:00
John J. Aylward 80e36eb63c Fixes error messages 2016-08-09 15:59:27 -04:00
John J. Aylward a2c311527b Updates tests to include all opt methods and verify for missing keys. 2016-08-09 15:54:06 -04:00
Sean Leary 45a7decba4 Revert "reduces the use of unnecessary exceptions" 2016-08-09 14:22:06 -05:00
Nicholas Cull 0c157cae75 JSONWriter uses Appendable. 2016-08-08 19:40:10 +10:00
Sean Leary 8e079599c4 Update README 20160807 2016-08-07 15:19:44 -05:00
Sean Leary 62524b531d Merge pull request #52 from johnjaylward/OptionalTypeConversion
updates Test cases to support new JSONML and XML conversion options
2016-07-31 21:09:34 -05:00
Sean Leary 3080b8beeb Merge pull request #253 from johnjaylward/OptionalTypeConversion
Optional type conversion for XML reading
2016-07-31 21:09:07 -05:00
Sean Leary 2c228ecf1a Merge pull request #249 from Simulant87/master
reduces the use of unnecessary exceptions
2016-07-26 23:04:49 -05:00
run2000 e57881f8fa Fail when exceptions are not thrown as expected
The idiom was started in the first few methods, but not continued further down where JSONException was expected. False success may have resulted.
2016-07-25 09:44:43 +10:00
Nicholas Cull efe33a1e37 Fix comment. 2016-07-24 19:57:01 +10:00
Nicholas Cull 1246e12827 Factor out Writer from Appendable tests. 2016-07-24 19:39:52 +10:00
Nicholas Cull ffcfa66d77 Add JSONString test class.
This set of tests demonstrates what happens when JSONString returns various results from its toJSONString() method. Tests for null returns and exceptions thrown. Also tests what happens for non-JSONString objects. The intent is to cover JSONObject's valueToString() and writeValue() methods.
2016-07-24 18:56:08 +10:00
Sean Leary 5d8ea6fa4e Update README.md 2016-07-23 10:13:21 -05:00
Sean Leary cdfdaba95b Update README.md 2016-07-23 10:12:33 -05:00
Sean Leary 2307f6f85e Update README.md 2016-07-23 10:12:04 -05:00
Sean Leary 6b4edbd40c Update README.md 2016-07-23 10:02:19 -05:00
Nicholas Cull ae77b5cd83 Tests for deep copy and mutability of toList() and toMap().
Both toMap() and toList() return deep copies, which are also mutable. That is, any changes to the JSONObject or JSONArray do not affect the newly create Map or List, and vice-versa. The resulting objects can be altered.
2016-07-23 22:51:50 +10:00
Nicholas Cull 72c2b911bf Tests for toString(), write(), toList(), and toMap().
Explicitly test variations of toString() and write() for different indent levels, and different method overloads. Also create some tests for the new toList() and toMap() methods for coverage improvements to JSONArray and JSONObject.
2016-07-23 22:33:19 +10:00
Nicholas Cull c3ba4bdbe5 Nesting depth test works as expected. 2016-07-23 19:12:51 +10:00
Nils Faupel 3890bfae52 reduce the use of unnecessary exceptions 2016-07-19 19:59:30 +02:00
Nils Faupel abf2963bbe Revert "reduces the use of unnecessary exceptions"
This reverts commit 7627d40d10.
2016-07-19 19:00:42 +02:00
John J. Aylward 215321cd28 updates Test cases to support new JSONML and XML conversion options 2016-07-18 15:04:03 -04:00
John J. Aylward 09d37e59b8 Cleans up the JSONML changes and adds similar changes to the XML class 2016-07-18 14:42:21 -04:00
John J. Aylward 93704371bb Updates to the Javadoc for exceptions 2016-07-18 14:12:06 -04:00
Jakob Stemberger 42e0944708 Brings in changes from PR #70 to be updated to HEAD 2016-07-18 13:45:31 -04:00
Sean Leary 71c1eba1e7 Merge pull request #51 from johnjaylward/VerifyOptConversions
Verify opt method conversions for JSONArray and JSONObject
2016-07-08 22:31:48 -05:00
John J. Aylward c2de224711 Verify opt method conversions for JSONArray and JSONObject 2016-07-08 16:58:58 -04:00
Simulant 7627d40d10 reduces the use of unnecessary exceptions 2016-07-08 22:17:05 +02:00
Sean Leary 04181fb6e2 Merge pull request #246 from johnjaylward/LicenseFile
Add License file
2016-07-02 13:20:54 -05:00
Sean Leary 239e0b7070 Merge pull request #242 from johnjaylward/issue240
Fixes Issue #240
2016-07-02 13:20:21 -05:00
johnjaylward a8a71898a3 Create LICENSE 2016-06-22 14:49:52 -04:00
johnjaylward 86e8f7b313 Update README
fixes typo
2016-06-17 16:39:11 -04:00
Sean Leary 01af31718e Merge pull request #50 from johnjaylward/issue240
Tests for Issue #240 in JSON-Java
2016-06-17 09:36:42 -05:00
John J. Aylward 1204ea9dcf fixes a typo 2016-06-17 00:04:27 -04:00
John J. Aylward c5deff636b updates README for new project layout 2016-06-16 23:59:34 -04:00
John J. Aylward 46a1c9acf9 Adds test case to confirm the parsing of control characters 2016-06-16 13:02:08 -04:00
John J. Aylward 42791ab12d Updates README to note that the parser does allow some invalid JSON 2016-06-16 13:01:22 -04:00
John J. Aylward 80f9e48e64 Moves src folder to simplify build.gradle configuration. If JSON-Java source is merged, it's src fold would now be src/main/java/org.json/ instead of src/main/org.json as well. 2016-06-16 12:20:54 -04:00
johnjaylward 0e0f3f2167 Merge pull request #1 from stleary/master
update from origin
2016-06-16 11:44:09 -04:00
johnjaylward b3abaa5b4c Merge pull request #1 from stleary/master
update from origin
2016-06-16 11:43:05 -04:00
Sean Leary 40f170b508 Merge pull request #49 from madsager/master
Add test that an invalid escape sequence results in a JSONException a…
2016-06-07 21:29:25 -05:00
Sean Leary eb569b58fc Merge pull request #236 from madsager/master
Make nextString throw a JSONException instead of a NumberFormatExcept…
2016-06-07 21:29:02 -05:00
Mads Ager c7fdada0fd Add test that an invalid escape sequence results in a JSONException and not a NumberFormatException. 2016-06-02 16:41:43 +02:00
Mads Ager 16a86d73df Pass in the throwable that caused the error. 2016-06-02 16:11:15 +02:00
Mads Ager dfa651e777 Make nextString throw a JSONException instead of a NumberFormatException for malformed input. 2016-06-02 15:56:48 +02:00
Sean Leary 51bcbebaa8 Merge pull request #48 from erosb/master
unittests for stleary/JSON-Java#233
2016-05-20 21:12:12 -05:00
Sean Leary 612dafc750 Update JSONObject.java 2016-05-20 21:10:17 -05:00
Sean Leary 808320801a Update JSONArray.java
Update version timestamp
2016-05-20 21:09:53 -05:00
Sean Leary b2bde1f468 Merge pull request #234 from erosb/master
fixing stleary/JSON-Java#233
2016-05-20 21:03:06 -05:00