From: <dal...@us...> - 2010-08-24 22:38:26
|
Revision: 18412 http://jedit.svn.sourceforge.net/jedit/?rev=18412&view=rev Author: daleanson Date: 2010-08-24 22:38:20 +0000 (Tue, 24 Aug 2010) Log Message: ----------- Added another unit test for json files. Modified Paths: -------------- plugins/Beauty/trunk/test/test/beauty/beautifiers/JsonBeautifierTest.java Added Paths: ----------- plugins/Beauty/trunk/test/resource/after/test4.json plugins/Beauty/trunk/test/resource/before/test4.json Added: plugins/Beauty/trunk/test/resource/after/test4.json =================================================================== --- plugins/Beauty/trunk/test/resource/after/test4.json (rev 0) +++ plugins/Beauty/trunk/test/resource/after/test4.json 2010-08-24 22:38:20 UTC (rev 18412) @@ -0,0 +1,108 @@ + +{ + "jcr:lastModifiedBy": "admin", + "jcr:lastModified": "Thu Jun 10 2010 10:36:18 GMT-0600", + "jcr:primaryType": "dam:AssetContent", + "metadata": + { + "dc:format": "image/gif", + "dam:Physicalwidthininches": 0.6944444179534912, + "jcr:mixinTypes": ["cq:Taggable"], + "tiff:ImageLength": 50, + "dam:extracted": "Thu Jun 10 2010 10:36:13 GMT-0600", + "dam:MIMEtype": "image/gif", + "dam:Numberofimages": -1, + "dam:Numberoftextualcomments": 0, + "jcr:primaryType": "nt:unstructured", + "dam:Progressive": "no", + "dam:Fileformat": "GIF", + "jcr:lastModifiedBy": "admin", + "dc:modified": "Thu Jun 10 2010 10:36:15 GMT-0600", + "dam:Bitsperpixel": 24, + "dam:Physicalwidthindpi": 72, + "dam:Physicalheightindpi": 72, + "jcr:lastModified": "Thu Jun 10 2010 10:36:15 GMT-0600", + "tiff:ImageWidth": 50 + }, + "renditions": + { + "jcr:createdBy": "admin", + "jcr:created": "Thu Jun 10 2010 10:36:08 GMT-0600", + "jcr:primaryType": "nt:folder", + "original": + { + "jcr:createdBy": "admin", + "jcr:created": "Thu Jun 10 2010 10:36:08 GMT-0600", + "jcr:primaryType": "nt:file", + "jcr:content": + { + "jcr:lastModifiedBy": "anonymous", + "jcr:uuid": "0789df3e-f4dc-48df-b3bb-ed6739f8dc03", + ":jcr:data": 2481, + "jcr:mimeType": "image/gif", + "jcr:lastModified": "Thu Jun 10 2010 10:36:07 GMT-0600", + "jcr:primaryType": "nt:resource" + } + }, + "cq5dam.thumbnail.140.100.png": + { + "jcr:createdBy": "admin", + "jcr:created": "Thu Jun 10 2010 10:36:15 GMT-0600", + "jcr:primaryType": "nt:file", + "jcr:content": + { + "jcr:lastModifiedBy": "admin", + "jcr:uuid": "c6f1911e-8bfd-4a42-95ea-756888356a5e", + ":jcr:data": 2422, + "jcr:mimeType": "image/png", + "jcr:lastModified": "Thu Jun 10 2010 10:36:15 GMT-0600", + "jcr:primaryType": "nt:resource" + } + }, + "cq5dam.thumbnail.48.48.png": + { + "jcr:createdBy": "admin", + "jcr:created": "Thu Jun 10 2010 10:36:15 GMT-0600", + "jcr:primaryType": "nt:file", + "jcr:content": + { + "jcr:lastModifiedBy": "admin", + "jcr:uuid": "1f8083fc-cc23-4636-a556-b2506c057efd", + ":jcr:data": 3356, + "jcr:mimeType": "image/png", + "jcr:lastModified": "Thu Jun 10 2010 10:36:15 GMT-0600", + "jcr:primaryType": "nt:resource" + } + }, + "cq5dam.thumbnail.319.319.png": + { + "jcr:createdBy": "admin", + "jcr:created": "Thu Jun 10 2010 10:36:15 GMT-0600", + "jcr:primaryType": "nt:file", + "jcr:content": + { + "jcr:lastModifiedBy": "admin", + "jcr:uuid": "6124c983-d0e4-405e-819c-62ef879d7b99", + ":jcr:data": 2422, + "jcr:mimeType": "image/png", + "jcr:lastModified": "Thu Jun 10 2010 10:36:15 GMT-0600", + "jcr:primaryType": "nt:resource" + } + }, + "cq5dam.web.1280.1280.gif": + { + "jcr:createdBy": "admin", + "jcr:created": "Thu Jun 10 2010 10:36:18 GMT-0600", + "jcr:primaryType": "nt:file", + "jcr:content": + { + "jcr:lastModifiedBy": "admin", + "jcr:uuid": "33f0c5cb-8556-4ad4-9f03-03209ec0661d", + ":jcr:data": 2481, + "jcr:mimeType": "image/gif", + "jcr:lastModified": "Thu Jun 10 2010 10:36:18 GMT-0600", + "jcr:primaryType": "nt:resource" + } + } + } +} \ No newline at end of file Added: plugins/Beauty/trunk/test/resource/before/test4.json =================================================================== --- plugins/Beauty/trunk/test/resource/before/test4.json (rev 0) +++ plugins/Beauty/trunk/test/resource/before/test4.json 2010-08-24 22:38:20 UTC (rev 18412) @@ -0,0 +1 @@ +{"jcr:lastModifiedBy":"admin","jcr:lastModified":"Thu Jun 10 2010 10:36:18 GMT-0600","jcr:primaryType":"dam:AssetContent","metadata":{"dc:format":"image/gif","dam:Physicalwidthininches":0.6944444179534912,"jcr:mixinTypes":["cq:Taggable"],"tiff:ImageLength":50,"dam:extracted":"Thu Jun 10 2010 10:36:13 GMT-0600","dam:MIMEtype":"image/gif","dam:Numberofimages":-1,"dam:Numberoftextualcomments":0,"jcr:primaryType":"nt:unstructured","dam:Progressive":"no","dam:Fileformat":"GIF","jcr:lastModifiedBy":"admin","dc:modified":"Thu Jun 10 2010 10:36:15 GMT-0600","dam:Bitsperpixel":24,"dam:Physicalwidthindpi":72,"dam:Physicalheightindpi":72,"jcr:lastModified":"Thu Jun 10 2010 10:36:15 GMT-0600","tiff:ImageWidth":50},"renditions":{"jcr:createdBy":"admin","jcr:created":"Thu Jun 10 2010 10:36:08 GMT-0600","jcr:primaryType":"nt:folder","original":{"jcr:createdBy":"admin","jcr:created":"Thu Jun 10 2010 10:36:08 GMT-0600","jcr:primaryType":"nt:file","jcr:content":{"jcr:lastModifiedBy":"anonymous","jcr:uuid":"0789df3e-f4dc-48df-b3bb-ed6739f8dc03",":jcr:data":2481,"jcr:mimeType":"image/gif","jcr:lastModified":"Thu Jun 10 2010 10:36:07 GMT-0600","jcr:primaryType":"nt:resource"}},"cq5dam.thumbnail.140.100.png":{"jcr:createdBy":"admin","jcr:created":"Thu Jun 10 2010 10:36:15 GMT-0600","jcr:primaryType":"nt:file","jcr:content":{"jcr:lastModifiedBy":"admin","jcr:uuid":"c6f1911e-8bfd-4a42-95ea-756888356a5e",":jcr:data":2422,"jcr:mimeType":"image/png","jcr:lastModified":"Thu Jun 10 2010 10:36:15 GMT-0600","jcr:primaryType":"nt:resource"}},"cq5dam.thumbnail.48.48.png":{"jcr:createdBy":"admin","jcr:created":"Thu Jun 10 2010 10:36:15 GMT-0600","jcr:primaryType":"nt:file","jcr:content":{"jcr:lastModifiedBy":"admin","jcr:uuid":"1f8083fc-cc23-4636-a556-b2506c057efd",":jcr:data":3356,"jcr:mimeType":"image/png","jcr:lastModified":"Thu Jun 10 2010 10:36:15 GMT-0600","jcr:primaryType":"nt:resource"}},"cq5dam.thumbnail.319.319.png":{"jcr:createdBy":"admin","jcr:created":"Thu Jun 10 2010 10:36:15 GMT-0600","jcr:primaryType":"nt:file","jcr:content":{"jcr:lastModifiedBy":"admin","jcr:uuid":"6124c983-d0e4-405e-819c-62ef879d7b99",":jcr:data":2422,"jcr:mimeType":"image/png","jcr:lastModified":"Thu Jun 10 2010 10:36:15 GMT-0600","jcr:primaryType":"nt:resource"}},"cq5dam.web.1280.1280.gif":{"jcr:createdBy":"admin","jcr:created":"Thu Jun 10 2010 10:36:18 GMT-0600","jcr:primaryType":"nt:file","jcr:content":{"jcr:lastModifiedBy":"admin","jcr:uuid":"33f0c5cb-8556-4ad4-9f03-03209ec0661d",":jcr:data":2481,"jcr:mimeType":"image/gif","jcr:lastModified":"Thu Jun 10 2010 10:36:18 GMT-0600","jcr:primaryType":"nt:resource"}}}} \ No newline at end of file Modified: plugins/Beauty/trunk/test/test/beauty/beautifiers/JsonBeautifierTest.java =================================================================== --- plugins/Beauty/trunk/test/test/beauty/beautifiers/JsonBeautifierTest.java 2010-08-24 21:58:42 UTC (rev 18411) +++ plugins/Beauty/trunk/test/test/beauty/beautifiers/JsonBeautifierTest.java 2010-08-24 22:38:20 UTC (rev 18412) @@ -20,7 +20,6 @@ FileUtilities.copy(reader, writer); String before = writer.toString(); - String answer = before; Beautifier beautifier = new JsonBeautifier(); beautifier.setEditMode("json"); @@ -91,4 +90,36 @@ fail(e.getMessage()); } } + + @Test + public void test4() { + try { + String resource = "before/test4.json"; + InputStream is = getClass().getClassLoader().getResourceAsStream(resource); + Reader reader = new InputStreamReader(is); + StringWriter writer = new StringWriter(); + FileUtilities.copy(reader, writer); + String before = writer.toString(); + + resource = "after/test4.json"; + is = getClass().getClassLoader().getResourceAsStream(resource); + reader = new InputStreamReader(is); + writer = new StringWriter(); + FileUtilities.copy(reader, writer); + String answer = writer.toString(); + + Beautifier beautifier = new JsonBeautifier(); + beautifier.setEditMode("json"); + beautifier.setLineSeparator("\n"); + beautifier.setTabWidth(4); + beautifier.setIndentWidth(4); + beautifier.setUseSoftTabs(true); + beautifier.setWrapMargin(80); + beautifier.setWrapMode("none"); + String after = beautifier.beautify(before); + assertTrue("json test 4 failed.", answer.equals(after)); + } catch (Exception e) { + fail(e.getMessage()); + } + } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |