mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #990 from psh/nearby-unit-test

Browse source 
Created a Robolectric unit test replacement for the (failing) NearbyActivity integration test
This commit is contained in:
Vivek Maskara 2017-11-30 19:46:06 +05:30 • committed by GitHub
commit 078feb9531
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 100 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
View file

@ -29,6 +29,7 @@ import java.io.IOException;
import javax.inject.Inject;
import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.HasActivityInjector;
import fr.free.nrw.commons.auth.AccountUtil;
@ -272,7 +273,7 @@ public class CommonsApplication extends Application implements HasActivityInject
}
@Override
public DispatchingAndroidInjector<Activity> activityInjector() {
public AndroidInjector<Activity> activityInjector() {
return dispatchingActivityInjector;
}

4
app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
View file

@ -338,7 +338,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
Fragment fragment = new NearbyMapFragment();
fragment.setArguments(bundle);
fragmentTransaction.replace(R.id.container, fragment);
fragmentTransaction.replace(R.id.container, fragment, fragment.getClass().getSimpleName());
fragmentTransaction.commitAllowingStateLoss();
}
@ -349,7 +349,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
Fragment fragment = new NearbyListFragment();
fragment.setArguments(bundle);
fragmentTransaction.replace(R.id.container, fragment);
fragmentTransaction.replace(R.id.container, fragment, fragment.getClass().getSimpleName());
fragmentTransaction.commitAllowingStateLoss();
}