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

Revert "Revert "Fix wrong anotations, but tests are still broken""

Browse source 
This reverts commit f7f4a72540.
This commit is contained in:
neslihanturan 2018-03-13 23:58:22 +03:00
parent f7f4a72540
commit d7a8989871
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/test/java/fr/free/nrw/commons/nearby/NearbyAdapterFactoryTest.java
View file

@ -33,15 +33,8 @@ public class NearbyAdapterFactoryTest {
private static final Place PLACE = new Place("name", Place.Label.AIRPORT, private static final Place PLACE = new Place("name", Place.Label.AIRPORT,
"desc", null, new LatLng(38.6270, -90.1994, 0), null); "desc", null, new LatLng(38.6270, -90.1994, 0), null);
private static final Place UNKNOWN_PLACE = new Place("name", Place.Label.UNKNOWN, private static final Place UNKNOWN_PLACE = new Place("name", Place.Label.UNKNOWN,
<<<<<<< HEAD
=======
<<<<<<< 27ac8ae0d72011bc651affecf7b1da2100ec927e
"?", null, new LatLng(39.7392, -104.9903, 0), null);
// ^ "?" is a special value for unknown class names from Wikidata query results
=======
>>>>>>> directNearbyUploadsNewLocal
"desc", null, new LatLng(39.7392, -104.9903, 0), null); "desc", null, new LatLng(39.7392, -104.9903, 0), null);
>>>>>>> Rename Description to Label to prevent misunderstandings
private Place clickedPlace; private Place clickedPlace;
@Test @Test