Fix wrong anotations, but tests are still broken

This commit is contained in:
neslihanturan 2018-03-09 14:14:41 +03:00
parent c82108f22e
commit aa61a0673f

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