escape \r characters

smart-fun · Dec 10, 2017 · 863b411 · 863b411
1 parent 3333a1a
commit 863b411
Show file tree

Hide file tree

Showing 4 changed files with 2,168 additions and 16 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/xmltojsonlib/src/androidTest/java/fr/arnaudguyon/xmltojsonlib/ExampleInstrumentedTest.java b/xmltojsonlib/src/androidTest/java/fr/arnaudguyon/xmltojsonlib/ExampleInstrumentedTest.java
@@ -5,6 +5,7 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.text.TextUtils;
+import android.util.Log;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -24,6 +25,8 @@
 @RunWith(AndroidJUnit4.class)
 public class ExampleInstrumentedTest {
 
+    private static final String TAG = "ExampleInstrumentedTest";
+
     @Test
     public void numbersTest() throws Exception {
 
@@ -163,7 +166,7 @@ public void skipAttributeTest() throws Exception {
         JSONArray books = library.getJSONArray("book");
         int size = books.length();
         assertTrue(size == 2);
-        for(int i=0; i<size; ++i) {
+        for (int i = 0; i < size; ++i) {
             JSONObject book = books.getJSONObject(i);
             assertFalse(book.has("id"));
         }
@@ -207,7 +210,7 @@ public void attributeReplacementTest() throws Exception {
         JSONObject library = result.getJSONObject("library");
         JSONArray books = library.getJSONArray("book");
         assertEquals(books.length(), 2);
-        for(int i=0 ;i<books.length(); ++i) {
+        for (int i = 0; i < books.length(); ++i) {
             JSONObject book = books.getJSONObject(i);
             book.getInt("attributeReplacement");
         }
@@ -279,5 +282,34 @@ public void escapeSpecialCharsTest() throws Exception {
         }
     }
 
+    // "\r" characters were not escaped
+    // RSS feed taken from https://www.bola.net/feed/
+    @Test
+    public void rssURLescaped() throws Exception {
+        Context context = InstrumentationRegistry.getTargetContext();
+        AssetManager assetManager = context.getAssets();
+        InputStream inputStream = assetManager.open("rss.xml");
+
+        XmlToJson xmlToJson = new XmlToJson.Builder(inputStream, null).build();
+        inputStream.close();
+
+        try {
+            JSONObject json = xmlToJson.toJson();
+            JSONObject rss = json.getJSONObject("rss");
+            JSONObject channel = rss.getJSONObject("channel");
+            JSONArray items = channel.getJSONArray("item");
+            for (int i = 0; i < items.length(); ++i) {
+                JSONObject item = items.getJSONObject(i);
+                JSONObject enclosure = item.getJSONObject("enclosure");
+                String url = enclosure.getString("url");
+                Log.i(TAG, "url: " + url);
+            }
+            json.toString();
+        } catch (JSONException exception) {
+            exception.printStackTrace();
+            assertTrue("invalid JSON", false);
+        }
+    }
+
 
 }