Add assertion on arguments bundle == null on by accessors access

MarcinMoskala · Jan 2, 2018 · 527dd5f · 527dd5f
1 parent 4128b7b
commit 527dd5f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...ystarter-compiler/src/main/java/activitystarter/compiler/generation/ActivityGeneration.kt b/...ystarter-compiler/src/main/java/activitystarter/compiler/generation/ActivityGeneration.kt
@@ -112,7 +112,7 @@ internal class ActivityGeneration(classModel: ClassModel) : IntentBinding(classM
             .addParameter(classModel.targetTypeName, "activity")
             .returns(TypeName.BOOLEAN)
             .addStatement("\$T intent = activity.getIntent()", INTENT)
-            .addStatement("return intent.hasExtra(${arg.keyFieldName})")
+            .addStatement("return intent != null && intent.hasExtra(${arg.keyFieldName})")
             .build()
 
     private fun buildGetValueMethod(arg: ArgumentModel): MethodSpec? = builderWithCreationBasicFieldsNoContext(arg.accessorName)

diff --git a/...ystarter-compiler/src/main/java/activitystarter/compiler/generation/FragmentGeneration.kt b/...ystarter-compiler/src/main/java/activitystarter/compiler/generation/FragmentGeneration.kt
@@ -94,7 +94,7 @@ internal class FragmentGeneration(classModel: ClassModel) : ClassGeneration(clas
             .addParameter(classModel.targetTypeName, "fragment")
             .returns(TypeName.BOOLEAN)
             .addStatement("\$T bundle = fragment.getArguments()", BUNDLE)
-            .addStatement("return bundle.containsKey(${arg.keyFieldName})")
+            .addStatement("return bundle != null && bundle.containsKey(${arg.keyFieldName})")
             .build()
 
     private fun buildGetValueMethod(arg: ArgumentModel): MethodSpec? = builderWithCreationBasicFieldsNoContext(arg.accessorName)

diff --git a/activitystarter/src/test/java/activitystarter/generation/ByAccessorsTest.kt b/activitystarter/src/test/java/activitystarter/generation/ByAccessorsTest.kt
@@ -8,11 +8,11 @@ class ByAccessorsTest : GenerationTest() {
 
     @Test
     fun singleGetterTest() {
-        filePrecessingComparator("getter/Single")
+        filePrecessingComparator("byAccessor/Single")
     }
 
     @Test
     fun getterSetterTest() {
-        filePrecessingComparator("getter/GetterSetter")
+        filePrecessingComparator("byAccessor/GetterSetter")
     }
 }
diff --git a/generationExamples/getter/GetterSetter → generationExamples/byAccessor/GetterSetter b/generationExamples/getter/GetterSetter → generationExamples/byAccessor/GetterSetter
@@ -52,7 +52,7 @@ public final class MainActivityStarter {
 
   public static boolean isFilledValueOfBFrom(MainActivity activity) {
     Intent intent = activity.getIntent();
-    return intent.hasExtra(B_KEY);
+    return intent != null && intent.hasExtra(B_KEY);
   }
 
   public static boolean getValueOfBFrom(MainActivity activity) {

diff --git a/generationExamples/getter/Single → generationExamples/byAccessor/Single b/generationExamples/getter/Single → generationExamples/byAccessor/Single
@@ -29,7 +29,7 @@ public final class MainActivityStarter {
 
   public static boolean isFilledValueOfNameFrom(MainActivity activity) {
     Intent intent = activity.getIntent();
-    return intent.hasExtra(NAME_KEY);
+    return intent != null && intent.hasExtra(NAME_KEY);
   }
 
   public static String getValueOfNameFrom(MainActivity activity) {