Fix tests

MarcinMoskala · Jul 20, 2017 · 6e2fb3b · 6e2fb3b
1 parent b697a89
commit 6e2fb3b
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 21 deletions.
diff --git a/generationExamples/fragment/ConflictedOptional b/generationExamples/fragment/ConflictedOptional
@@ -17,14 +17,25 @@ import android.os.Bundle;
 import java.lang.String;
 
 public final class MainFragmentStarter {
-
   private static final String NAME_KEY = "com.example.activitystarter.nameStarterKey";
+
   private static final String SURNAME_KEY = "com.example.activitystarter.surnameStarterKey";
 
-  public static void fill(MainFragment fragment) {
+  public static void fill(MainFragment fragment, Bundle savedInstanceState) {
     Bundle arguments = fragment.getArguments();
-    if(arguments.containsKey(NAME_KEY))     fragment.name = arguments.getString(NAME_KEY);
-    if(arguments.containsKey(SURNAME_KEY))     fragment.surname = arguments.getString(SURNAME_KEY);
+
+    if(savedInstanceState != null && savedInstanceState.containsKey(NAME_KEY)) {
+        fragment.name = savedInstanceState.getString(NAME_KEY);
+    } else if(arguments != null && arguments.containsKey(NAME_KEY)) fragment.name = arguments.getString(NAME_KEY);
+
+    if(savedInstanceState != null && savedInstanceState.containsKey(SURNAME_KEY)) {
+        fragment.surname = savedInstanceState.getString(SURNAME_KEY);
+    } else if(arguments != null && arguments.containsKey(SURNAME_KEY)) fragment.surname = arguments.getString(SURNAME_KEY);
+  }
+
+  public static void save(MainFragment fragment, Bundle bundle) {
+    bundle.putString(NAME_KEY, fragment.name);
+    bundle.putString(SURNAME_KEY, fragment.surname);
   }
 
   public static MainFragment newInstance(String name, String surname) {
@@ -48,4 +59,4 @@ public final class MainFragmentStarter {
     MainFragment fragment = new MainFragment();
     return fragment;
   }
-}
+}
diff --git a/generationExamples/fragment/EmptyAnnotated b/generationExamples/fragment/EmptyAnnotated
@@ -10,9 +10,13 @@ public class MainFragment extends Fragment {}
 ********com.example.activitystarter.MainFragmentStarter********
 package com.example.activitystarter;
 
+import android.os.Bundle;
+
 public final class MainFragmentStarter {
-  public static void fill(MainFragment fragment) {
-  }
+
+  public static void fill(MainFragment fragment, Bundle savedInstanceState) {}
+
+  public static void save(MainFragment fragment, Bundle bundle) {}
 
   public static MainFragment newInstance() {
     MainFragment fragment = new MainFragment();

diff --git a/generationExamples/fragment/MultipleOptional b/generationExamples/fragment/MultipleOptional
@@ -17,14 +17,23 @@ import android.os.Bundle;
 import java.lang.String;
 
 public final class MainFragmentStarter {
-
   private static final String NAME_KEY = "com.example.activitystarter.nameStarterKey";
+
   private static final String ID_KEY = "com.example.activitystarter.idStarterKey";
 
-  public static void fill(MainFragment fragment) {
+  public static void fill(MainFragment fragment, Bundle savedInstanceState) {
     Bundle arguments = fragment.getArguments();
-    if(arguments.containsKey(NAME_KEY))     fragment.name = arguments.getString(NAME_KEY);
-    if(arguments.containsKey(ID_KEY))     fragment.id = arguments.getInt(ID_KEY);
+    if(savedInstanceState != null && savedInstanceState.containsKey(NAME_KEY)) {
+    fragment.name = savedInstanceState.getString(NAME_KEY);
+    } else if(arguments != null && arguments.containsKey(NAME_KEY)) fragment.name = arguments.getString(NAME_KEY);
+    if(savedInstanceState != null && savedInstanceState.containsKey(ID_KEY)) {
+    fragment.id = savedInstanceState.getInt(ID_KEY);
+    } else if(arguments != null && arguments.containsKey(ID_KEY)) fragment.id = arguments.getInt(ID_KEY);
+  }
+
+  public static void save(MainFragment fragment, Bundle bundle) {
+    bundle.putString(NAME_KEY, fragment.name);
+    bundle.putInt(ID_KEY, fragment.id);
   }
 
   public static MainFragment newInstance(String name, int id) {

diff --git a/generationExamples/fragment/Optional b/generationExamples/fragment/Optional
@@ -16,12 +16,18 @@ import android.os.Bundle;
 import java.lang.String;
 
 public final class MainFragmentStarter {
-
   private static final String NAME_KEY = "com.example.activitystarter.nameStarterKey";
 
-  public static void fill(MainFragment fragment) {
+  public static void fill(MainFragment fragment, Bundle savedInstanceState) {
     Bundle arguments = fragment.getArguments();
-    if(arguments.containsKey(NAME_KEY))     fragment.name = arguments.getString(NAME_KEY);
+    if(savedInstanceState != null && savedInstanceState.containsKey(NAME_KEY)) {
+        fragment.name = savedInstanceState.getString(NAME_KEY);
+    } else if(arguments != null && arguments.containsKey(NAME_KEY))
+        fragment.name = arguments.getString(NAME_KEY);
+  }
+
+  public static void save(MainFragment fragment, Bundle bundle) {
+    bundle.putString(NAME_KEY, fragment.name);
   }
 
   public static MainFragment newInstance(String name) {

diff --git a/generationExamples/fragment/SetterGetter b/generationExamples/fragment/SetterGetter
@@ -24,13 +24,18 @@ import android.os.Bundle;
 import java.lang.String;
 
 public final class MainFragmentStarter {
-
   private static final String NAME_KEY = "com.example.activitystarter.nameStarterKey";
 
-  public static void fill(MainFragment fragment) {
+  public static void fill(MainFragment fragment, Bundle savedInstanceState) {
     Bundle arguments = fragment.getArguments();
-    if(arguments.containsKey(NAME_KEY))
-         fragment.setName(arguments.getString(NAME_KEY));
+    if(savedInstanceState != null && savedInstanceState.containsKey(NAME_KEY)) {
+       fragment.setName(savedInstanceState.getString(NAME_KEY));
+    } else if(arguments != null && arguments.containsKey(NAME_KEY))
+       fragment.setName(arguments.getString(NAME_KEY));
+  }
+
+  public static void save(MainFragment fragment, Bundle bundle) {
+    bundle.putString(NAME_KEY, fragment.getName());
   }
 
   public static MainFragment newInstance(String name) {

diff --git a/generationExamples/fragment/Simple b/generationExamples/fragment/Simple
@@ -15,12 +15,17 @@ import android.os.Bundle;
 import java.lang.String;
 
 public final class MainFragmentStarter {
-
   private static final String NAME_KEY = "com.example.activitystarter.nameStarterKey";
 
-  public static void fill(MainFragment fragment) {
+  public static void fill(MainFragment fragment, Bundle savedInstanceState) {
     Bundle arguments = fragment.getArguments();
-    if(arguments.containsKey(NAME_KEY))     fragment.name = arguments.getString(NAME_KEY);
+    if(savedInstanceState != null && savedInstanceState.containsKey(NAME_KEY)) {
+    fragment.name = savedInstanceState.getString(NAME_KEY);
+    } else if(arguments != null && arguments.containsKey(NAME_KEY)) fragment.name = arguments.getString(NAME_KEY);
+  }
+
+  public static void save(MainFragment fragment, Bundle bundle) {
+    bundle.putString(NAME_KEY, fragment.name);
   }
 
   public static MainFragment newInstance(String name) {