Skip to content

Commit

Permalink
3rd lot of fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
simonpoole committed Oct 16, 2023
1 parent b053282 commit f5584f9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void selectNodes() {
TestUtils.clickAtCoordinates(device, map, 8.38782, 47.390339, true);
TestUtils.clickText(device, true, context.getString(R.string.okay), true, false); // Tip
TestUtils.findText(device, false, "↓ Toilets", 10000);
assertTrue(TestUtils.clickText(device, false, "↓ Toilets", false, false));
assertTrue(TestUtils.clickText(device, false, "↓ Toilets", true, false));
Node node = App.getLogic().getSelectedNode();
assertNotNull(node);
assertEquals(3465444349L, node.getOsmId());
Expand Down Expand Up @@ -139,7 +139,7 @@ public void selectAndMergeWays() {
TestUtils.clickAtCoordinates(device, map, 8.3899934, 47.3898778, true);
TestUtils.textGone(device, context.getString(R.string.menu_split), 1);
TestUtils.clickAtCoordinates(device, map, 8.3899204, 47.3898603, true);
assertTrue(TestUtils.clickText(device, false, "Path", false, false));
assertTrue(TestUtils.clickText(device, false, "↙' Path", false, false));
assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_wayselect)));
assertTrue(TestUtils.clickOverflowButton(device));
TestUtils.scrollTo(context.getString(R.string.menu_extend_selection), false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void selectRelation() {
TestUtils.zoomToLevel(device, main, 21);
TestUtils.clickAtCoordinates(device, map, 8.3893820, 47.3895626, true);
TestUtils.clickAwayTip(device, context);
assertTrue(TestUtils.clickText(device, false, "Hiking", false, false));
assertTrue(TestUtils.clickText(device, false, "Hiking", false, false));
List<Relation> rels = App.getLogic().getSelectedRelations();
assertNotNull(rels);
assertEquals(1, rels.size());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void createRoute() {
TestUtils.zoomToLevel(device, main, 21);
TestUtils.clickAtCoordinates(device, map, 8.3893820, 47.3895626, true);
TestUtils.clickText(device, true, context.getString(R.string.okay), true, false); // Tip
assertTrue(TestUtils.clickText(device, false, "Path", false, false));
assertTrue(TestUtils.clickText(device, false, "Path", false, false));
Way way = App.getLogic().getSelectedWay();
assertNotNull(way);
assertEquals(104148456L, way.getOsmId());
Expand Down Expand Up @@ -250,7 +250,7 @@ public void addToRoute() {
TestUtils.zoomToLevel(device, main, 21);
TestUtils.clickAtCoordinates(device, map, 8.3884403, 47.3884988, true);
TestUtils.clickText(device, true, context.getString(R.string.okay), true, false); // Tip
assertTrue(TestUtils.clickText(device, false, "Bergstrasse", true, false));
assertTrue(TestUtils.clickText(device, false, "Bergstrasse", true, false));
assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_wayselect)));
Way way = App.getLogic().getSelectedWay();
assertNotNull(way);
Expand Down
4 changes: 2 additions & 2 deletions src/androidTest/java/de/blau/android/easyedit/WayTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public void splitAndMergeWay() {
TestUtils.sleep(2000);
assertTrue(TestUtils.textGone(device, context.getString(R.string.actionmode_wayselect), 5000));
TestUtils.clickAtCoordinates(device, map, 8.3893820, 47.3895626, true);
assertTrue(TestUtils.clickText(device, false, " Path", false, false));
assertTrue(TestUtils.clickText(device, false, " Path", false, false));
assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_wayselect)));
way = App.getLogic().getSelectedWay();
assertNotNull(way);
Expand Down Expand Up @@ -215,7 +215,7 @@ public void splitWaySelectPart() {
TestUtils.sleep(2000);
assertTrue(TestUtils.textGone(device, context.getString(R.string.actionmode_wayselect), 5000));
TestUtils.clickAtCoordinates(device, map, 8.3893820, 47.3895626, true);
assertTrue(TestUtils.clickText(device, false, " Path", false, false));
assertTrue(TestUtils.clickText(device, false, " Path", false, false));
assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_wayselect)));
way = App.getLogic().getSelectedWay();
assertNotNull(way);
Expand Down

0 comments on commit f5584f9

Please sign in to comment.