Fixed build, added test coverage

afollestad · Mar 1, 2017 · c7e6cae · c7e6cae
1 parent fc27da7
commit c7e6cae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/main/java/com/afollestad/ason/Util.java b/src/main/java/com/afollestad/ason/Util.java
@@ -218,8 +218,9 @@ static boolean isList(Class<?> cls) {
     }
 
     static boolean shouldIgnore(Field field) {
-        return field.getName().startsWith("this$") ||
-                field.getAnnotation(AsonIgnore.class) != null;
+        return field.getName().startsWith("this$")
+                || field.getName().equals("$jacocoData") // used with Jacoco testing
+                || field.getAnnotation(AsonIgnore.class) != null;
     }
 
     static String fieldName(Field field) {

diff --git a/src/test/java/com/afollestad/ason/UtilTest.java b/src/test/java/com/afollestad/ason/UtilTest.java
@@ -13,7 +13,7 @@
 /**
  * @author Aidan Follestad (afollestad)
  */
-public class UtilTest {
+@SuppressWarnings("unused") public class UtilTest {
 
     @SuppressWarnings("unused") static class DefaultCtorClass {
 
@@ -113,4 +113,14 @@ public class UtilTest {
         } catch (Throwable ignored) {
         }
     }
+
+    @AsonIgnore Field ignoreYes1;
+    Field $jacocoData;
+    Field ignoreNo2;
+
+    @Test public void test_should_ignore() throws Exception {
+        assertTrue(shouldIgnore(getClass().getDeclaredField("ignoreYes1")));
+        assertTrue(shouldIgnore(getClass().getDeclaredField("$jacocoData")));
+        assertFalse(shouldIgnore(getClass().getDeclaredField("ignoreNo2")));
+    }
 }