From 38d11227ee5608536b78af410e50d4af293626a8 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john@johnanddalene.net>
Date: Sun, 9 Jul 2017 19:05:00 -0400
Subject: [PATCH] Adds exception tests

---
 .../java/org/json/junit/JSONObjectTest.java   | 14 ++++
 .../org/json/junit/data/ExceptionalBean.java  | 69 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 src/test/java/org/json/junit/data/ExceptionalBean.java

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 190f32a..8e61c53 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -32,6 +32,7 @@ import org.json.JSONObject;
 import org.json.JSONPointerException;
 import org.json.XML;
 import org.json.junit.data.BrokenToString;
+import org.json.junit.data.ExceptionalBean;
 import org.json.junit.data.Fraction;
 import org.json.junit.data.GenericBean;
 import org.json.junit.data.GenericBeanInt;
@@ -2680,4 +2681,17 @@ public class JSONObjectTest {
                 1, jo.length());
         assertNotNull(jo.get("ALL"));
     }
+    
+    /**
+     * Tests the exception portions of populateMap.
+     */
+    @Test
+    public void testExceptionalBean() {
+        ExceptionalBean bean = new ExceptionalBean();
+        final JSONObject jo = new JSONObject(bean);
+        assertEquals("Expected 1 key to be mapped. Instead found: "+jo.keySet().toString(),
+                1, jo.length());
+        assertTrue(jo.get("closeable") instanceof JSONObject);
+        assertTrue(jo.getJSONObject("closeable").has("string"));
+    }
 }
diff --git a/src/test/java/org/json/junit/data/ExceptionalBean.java b/src/test/java/org/json/junit/data/ExceptionalBean.java
new file mode 100644
index 0000000..74d78a7
--- /dev/null
+++ b/src/test/java/org/json/junit/data/ExceptionalBean.java
@@ -0,0 +1,69 @@
+/**
+ * 
+ */
+package org.json.junit.data;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import org.json.JSONObject;
+
+/**
+ * Object for testing the exception handling in {@link JSONObject#populateMap}.
+ * 
+ * @author John Aylward
+ */
+public class ExceptionalBean {
+    /**
+     * @return a closeable.
+     */
+    public Closeable getCloseable() {
+        // anonymous inner class did not work...
+        return new MyCloseable();
+    }
+
+    /**
+     * @return Nothing really. Just can't be void.
+     * @throws IllegalAccessException
+     *             always thrown
+     */
+    public int getIllegalAccessException() throws IllegalAccessException {
+        throw new IllegalAccessException("Yup, it's illegal");
+    }
+
+    /**
+     * @return Nothing really. Just can't be void.
+     * @throws IllegalArgumentException
+     *             always thrown
+     */
+    public int getIllegalArgumentException() throws IllegalArgumentException {
+        throw new IllegalArgumentException("Yup, it's illegal");
+    }
+
+    /**
+     * @return Nothing really. Just can't be void.
+     * @throws InvocationTargetException
+     *             always thrown
+     */
+    public int getInvocationTargetException() throws InvocationTargetException {
+        throw new InvocationTargetException(new Exception("Yup, it's illegal"));
+    }
+
+    /** My closeable class. */
+    public static final class MyCloseable implements Closeable {
+
+        /**
+         * @return a string
+         */
+        @SuppressWarnings("unused")
+        public String getString() {
+            return "Yup, it's closeable";
+        }
+
+        @Override
+        public void close() throws IOException {
+            throw new IOException("Closing is too hard!");
+        }
+    }
+}