Skip to content

Commit b201b1f

Browse files
author
Cameron Mace
committed
fixed test
1 parent 0af5c85 commit b201b1f

4 files changed

Lines changed: 44 additions & 44 deletions

File tree

‎navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/NavigationEngine.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void onLocationChanged(DirectionsRoute directionsRoute, Location location) {
8787
SnapLocation snapLocation = new SnapLocation(location,
8888
previousRouteProgress.getCurrentLegProgress().getCurrentStep(), options);
8989

90-
// Create a new RouteProgress object using the latest user location
90+
// Create a RouteProgress.create object using the latest user location
9191
RouteProgress routeProgress = RouteProgress.create(directionsRoute, snapLocation.getUsersCurrentSnappedPosition(),
9292
legIndex, stepIndex, alertLevel);
9393

‎navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/RouteProgressTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ public void setup() {
3838

3939
@Test
4040
public void sanityTest() {
41-
RouteProgress routeProgress = new RouteProgress(route, userSnappedPosition, 0, 0, 0);
41+
RouteProgress routeProgress = RouteProgress.create(route, userSnappedPosition, 0, 0, 0);
4242
assertNotNull("should not be null", routeProgress);
4343
}
4444

4545
@Test
4646
public void getRoute_returnsDirectionsRoute() {
4747
RouteProgress routeProgress
48-
= new RouteProgress(route, userSnappedPosition, 0, 0, NavigationConstants.DEPART_ALERT_LEVEL);
48+
= RouteProgress.create(route, userSnappedPosition, 0, 0, NavigationConstants.DEPART_ALERT_LEVEL);
4949

5050
Assert.assertEquals(route, routeProgress.getRoute());
5151
}
5252

5353
@Test
5454
public void getAlertLevel_returnsCorrectAlertLevel() {
5555
RouteProgress routeProgress
56-
= new RouteProgress(route, userSnappedPosition, 0, 0, NavigationConstants.LOW_ALERT_LEVEL);
56+
= RouteProgress.create(route, userSnappedPosition, 0, 0, NavigationConstants.LOW_ALERT_LEVEL);
5757

5858
Assert.assertEquals(NavigationConstants.LOW_ALERT_LEVEL, routeProgress.getAlertUserLevel());
5959
Assert.assertNotSame(NavigationConstants.HIGH_ALERT_LEVEL, routeProgress.getAlertUserLevel());
@@ -62,7 +62,7 @@ public void getAlertLevel_returnsCorrectAlertLevel() {
6262
@Test
6363
public void getDistanceRemaining_equalsZeroAtEndOfRoute() {
6464
RouteProgress routeProgress
65-
= new RouteProgress(
65+
= RouteProgress.create(
6666
route, firstLeg.getSteps().get(firstLeg.getSteps().size() - 1).getManeuver().asPosition(),
6767
route.getLegs().size() - 1, firstLeg.getSteps().size() - 1, NavigationConstants.LOW_ALERT_LEVEL);
6868

@@ -72,7 +72,7 @@ public void getDistanceRemaining_equalsZeroAtEndOfRoute() {
7272
@Test
7373
public void getDistanceRemaining_equalsRouteDistanceAtBeginning() {
7474
RouteProgress routeProgress
75-
= new RouteProgress(
75+
= RouteProgress.create(
7676
route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
7777
0, 0, NavigationConstants.LOW_ALERT_LEVEL);
7878

@@ -82,7 +82,7 @@ public void getDistanceRemaining_equalsRouteDistanceAtBeginning() {
8282
@Test
8383
public void getFractionTraveled_equalsZeroAtBeginning() {
8484
RouteProgress routeProgress
85-
= new RouteProgress(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
85+
= RouteProgress.create(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
8686
0, 0, NavigationConstants.DEPART_ALERT_LEVEL);
8787

8888
Assert.assertEquals(0, routeProgress.getFractionTraveled(), BaseTest.LARGE_DELTA);
@@ -98,7 +98,7 @@ public void getFractionTraveled_equalsCorrectValueAtIntervals() {
9898
for (double i = 0; i < route.getDistance(); i += stepSegments) {
9999
Position position = TurfMeasurement.along(lineString, i, TurfConstants.UNIT_METERS).getCoordinates();
100100

101-
RouteProgress routeProgress = new RouteProgress(route, position, 0, 0, NavigationConstants.DEPART_ALERT_LEVEL);
101+
RouteProgress routeProgress = RouteProgress.create(route, position, 0, 0, NavigationConstants.DEPART_ALERT_LEVEL);
102102
float fractionRemaining = (float) (routeProgress.getDistanceTraveled() / route.getDistance());
103103
Assert.assertEquals(fractionRemaining, routeProgress.getFractionTraveled(), BaseTest.DELTA);
104104
}
@@ -109,7 +109,7 @@ public void getFractionTraveled_equalsOneAtEndOfRoute() {
109109
Position lastCoordinate
110110
= route.getLegs().get(0).getSteps().get(route.getLegs().get(0).getSteps().size() - 1).getManeuver().asPosition();
111111

112-
RouteProgress routeProgress = new RouteProgress(route, lastCoordinate,
112+
RouteProgress routeProgress = RouteProgress.create(route, lastCoordinate,
113113
route.getLegs().size() - 1, firstLeg.getSteps().size() - 1, NavigationConstants.ARRIVE_ALERT_LEVEL);
114114

115115
Assert.assertEquals(1.0, routeProgress.getFractionTraveled(), DELTA);
@@ -118,7 +118,7 @@ public void getFractionTraveled_equalsOneAtEndOfRoute() {
118118
@Test
119119
public void getDurationRemaining_equalsRouteDurationAtBeginning() {
120120
RouteProgress routeProgress
121-
= new RouteProgress(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
121+
= RouteProgress.create(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
122122
0, 0, NavigationConstants.DEPART_ALERT_LEVEL);
123123

124124
Assert.assertEquals(3535.2, routeProgress.getDurationRemaining(), BaseTest.DELTA);
@@ -129,7 +129,7 @@ public void getDurationRemaining_equalsZeroAtEndOfRoute() {
129129
Position lastCoordinate
130130
= route.getLegs().get(0).getSteps().get(route.getLegs().get(0).getSteps().size() - 1).getManeuver().asPosition();
131131

132-
RouteProgress routeProgress = new RouteProgress(route, lastCoordinate,
132+
RouteProgress routeProgress = RouteProgress.create(route, lastCoordinate,
133133
route.getLegs().size() - 1, firstLeg.getSteps().size() - 1, NavigationConstants.ARRIVE_ALERT_LEVEL);
134134

135135
Assert.assertEquals(0, routeProgress.getDurationRemaining(), BaseTest.DELTA);
@@ -138,7 +138,7 @@ public void getDurationRemaining_equalsZeroAtEndOfRoute() {
138138
@Test
139139
public void getDistanceTraveled_equalsZeroAtBeginning() {
140140
RouteProgress routeProgress
141-
= new RouteProgress(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
141+
= RouteProgress.create(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
142142
0, 0, NavigationConstants.DEPART_ALERT_LEVEL);
143143
Assert.assertEquals(0, routeProgress.getDistanceTraveled(), BaseTest.DELTA);
144144
}
@@ -148,7 +148,7 @@ public void getDistanceTraveled_equalsRouteDistanceAtEndOfRoute() {
148148
Position lastCoordinate
149149
= route.getLegs().get(0).getSteps().get(route.getLegs().get(0).getSteps().size() - 1).getManeuver().asPosition();
150150

151-
RouteProgress routeProgress = new RouteProgress(route, lastCoordinate,
151+
RouteProgress routeProgress = RouteProgress.create(route, lastCoordinate,
152152
route.getLegs().size() - 1, firstLeg.getSteps().size() - 1, NavigationConstants.ARRIVE_ALERT_LEVEL);
153153

154154
Assert.assertEquals(route.getDistance(), routeProgress.getDistanceTraveled(), BaseTest.DELTA);
@@ -157,7 +157,7 @@ public void getDistanceTraveled_equalsRouteDistanceAtEndOfRoute() {
157157
@Test
158158
public void getCurrentLeg_returnsCurrentLeg() {
159159
RouteProgress routeProgress
160-
= new RouteProgress(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
160+
= RouteProgress.create(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
161161
0, 0, NavigationConstants.DEPART_ALERT_LEVEL);
162162

163163
Assert.assertEquals(route.getLegs().get(0), routeProgress.getCurrentLeg());
@@ -166,7 +166,7 @@ public void getCurrentLeg_returnsCurrentLeg() {
166166
@Test
167167
public void getLegIndex_returnsCurrentLegIndex() {
168168
RouteProgress routeProgress
169-
= new RouteProgress(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
169+
= RouteProgress.create(route, firstLeg.getSteps().get(0).getManeuver().asPosition(),
170170
0, 0, NavigationConstants.DEPART_ALERT_LEVEL);
171171

172172
Assert.assertEquals(0, routeProgress.getLegIndex());

‎navigation/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/models/RouteLegProgressTest.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ public void setup() {
3737
@Test
3838
public void sanityTest() {
3939
RouteLegProgress routeLegProgress
40-
= new RouteLegProgress(firstLeg, 0, Mockito.mock(Position.class));
40+
= RouteLegProgress.create(firstLeg, 0, Mockito.mock(Position.class));
4141
Assert.assertNotNull("should not be null", routeLegProgress);
4242
}
4343

4444
@Test
4545
public void getUpComingStep_returnsNextStepInLeg() {
4646
RouteLegProgress routeLegProgress
47-
= new RouteLegProgress(firstLeg, 5, firstLeg.getSteps().get(4).getManeuver().asPosition());
47+
= RouteLegProgress.create(firstLeg, 5, firstLeg.getSteps().get(4).getManeuver().asPosition());
4848

4949
// TODO replace with equalsTo once https://github.com/mapbox/mapbox-java/pull/450 merged
5050
Assert.assertTrue(routeLegProgress.getUpComingStep().getGeometry()
@@ -55,7 +55,7 @@ public void getUpComingStep_returnsNextStepInLeg() {
5555
public void getUpComingStep_returnsNull() {
5656
int lastStepIndex = firstLeg.getSteps().size() - 1;
5757
RouteLegProgress routeLegProgress
58-
= new RouteLegProgress(firstLeg, lastStepIndex,
58+
= RouteLegProgress.create(firstLeg, lastStepIndex,
5959
firstLeg.getSteps().get(lastStepIndex - 2).getManeuver().asPosition());
6060

6161
Assert.assertNull(routeLegProgress.getUpComingStep());
@@ -64,7 +64,7 @@ public void getUpComingStep_returnsNull() {
6464
@Test
6565
public void getCurrentStep_returnsCurrentStep() {
6666
RouteLegProgress routeLegProgress
67-
= new RouteLegProgress(firstLeg, 5, firstLeg.getSteps().get(4).getManeuver().asPosition());
67+
= RouteLegProgress.create(firstLeg, 5, firstLeg.getSteps().get(4).getManeuver().asPosition());
6868

6969
// TODO replace with equalsTo once https://github.com/mapbox/mapbox-java/pull/450 merged
7070
Assert.assertEquals(
@@ -78,7 +78,7 @@ public void getCurrentStep_returnsCurrentStep() {
7878
@Test
7979
public void getPreviousStep_returnsPreviousStep() {
8080
RouteLegProgress routeLegProgress
81-
= new RouteLegProgress(firstLeg, 5, firstLeg.getSteps().get(4).getManeuver().asPosition());
81+
= RouteLegProgress.create(firstLeg, 5, firstLeg.getSteps().get(4).getManeuver().asPosition());
8282

8383
// TODO replace with equalsTo once https://github.com/mapbox/mapbox-java/pull/450 merged
8484
Assert.assertEquals(
@@ -91,7 +91,7 @@ public void getPreviousStep_returnsPreviousStep() {
9191

9292
@Test
9393
public void getStepIndex_returnsCurrentStepIndex() {
94-
RouteLegProgress routeLegProgress = new RouteLegProgress(firstLeg, 3,
94+
RouteLegProgress routeLegProgress = RouteLegProgress.create(firstLeg, 3,
9595
firstLeg.getSteps().get(4).getManeuver().asPosition());
9696

9797
Assert.assertEquals(3, routeLegProgress.getStepIndex(), BaseTest.DELTA);
@@ -100,7 +100,7 @@ public void getStepIndex_returnsCurrentStepIndex() {
100100
@Test
101101
public void getFractionTraveled_equalsZeroAtBeginning() {
102102
RouteLegProgress routeLegProgress
103-
= new RouteLegProgress(firstLeg, 0, firstLeg.getSteps().get(0).getManeuver().asPosition());
103+
= RouteLegProgress.create(firstLeg, 0, firstLeg.getSteps().get(0).getManeuver().asPosition());
104104

105105
Assert.assertEquals(0.0, routeLegProgress.getFractionTraveled(), BaseTest.DELTA);
106106
}
@@ -114,15 +114,15 @@ public void getFractionTraveled_equalsCorrectValueAtIntervals() {
114114
for (double i = 0; i < firstLeg.getDistance(); i += stepSegments) {
115115
Position position = TurfMeasurement.along(lineString, i, TurfConstants.UNIT_METERS).getCoordinates();
116116

117-
RouteLegProgress routeLegProgress = new RouteLegProgress(firstLeg, 0, position);
117+
RouteLegProgress routeLegProgress = RouteLegProgress.create(firstLeg, 0, position);
118118
float fractionRemaining = (float) (routeLegProgress.getDistanceTraveled() / firstLeg.getDistance());
119119
Assert.assertEquals(fractionRemaining, routeLegProgress.getFractionTraveled(), BaseTest.DELTA);
120120
}
121121
}
122122

123123
@Test
124124
public void getFractionTraveled_equalsOneAtEndOfLeg() {
125-
RouteLegProgress routeLegProgress = new RouteLegProgress(firstLeg, firstLeg.getSteps().size() - 1,
125+
RouteLegProgress routeLegProgress = RouteLegProgress.create(firstLeg, firstLeg.getSteps().size() - 1,
126126
firstLeg.getSteps().get(firstLeg.getSteps().size() - 1).getManeuver().asPosition());
127127

128128
Assert.assertEquals(1.0, routeLegProgress.getFractionTraveled(), BaseTest.DELTA);
@@ -131,14 +131,14 @@ public void getFractionTraveled_equalsOneAtEndOfLeg() {
131131
@Test
132132
public void getDistanceRemaining_equalsLegDistanceAtBeginning() {
133133
RouteLegProgress routeLegProgress
134-
= new RouteLegProgress(firstLeg, 0, firstLeg.getSteps().get(0).getManeuver().asPosition());
134+
= RouteLegProgress.create(firstLeg, 0, firstLeg.getSteps().get(0).getManeuver().asPosition());
135135

136136
Assert.assertEquals(firstLeg.getDistance(), routeLegProgress.getDistanceRemaining(), BaseTest.LARGE_DELTA);
137137
}
138138

139139
@Test
140140
public void getDistanceRemaining_equalsZeroAtEndOfLeg() {
141-
RouteLegProgress routeLegProgress = new RouteLegProgress(firstLeg, firstLeg.getSteps().size() - 1,
141+
RouteLegProgress routeLegProgress = RouteLegProgress.create(firstLeg, firstLeg.getSteps().size() - 1,
142142
firstLeg.getSteps().get(firstLeg.getSteps().size() - 1).getManeuver().asPosition());
143143

144144
Assert.assertEquals(0, routeLegProgress.getDistanceRemaining(), BaseTest.DELTA);
@@ -147,13 +147,13 @@ public void getDistanceRemaining_equalsZeroAtEndOfLeg() {
147147
@Test
148148
public void getDistanceTraveled_equalsZeroAtBeginning() {
149149
RouteLegProgress routeLegProgress
150-
= new RouteLegProgress(firstLeg, 0, firstLeg.getSteps().get(0).getManeuver().asPosition());
150+
= RouteLegProgress.create(firstLeg, 0, firstLeg.getSteps().get(0).getManeuver().asPosition());
151151
Assert.assertEquals(0, routeLegProgress.getDistanceTraveled(), BaseTest.DELTA);
152152
}
153153

154154
@Test
155155
public void getDistanceTraveled_equalsLegDistanceAtEndOfLeg() {
156-
RouteLegProgress routeLegProgress = new RouteLegProgress(firstLeg, firstLeg.getSteps().size() - 1,
156+
RouteLegProgress routeLegProgress = RouteLegProgress.create(firstLeg, firstLeg.getSteps().size() - 1,
157157
firstLeg.getSteps().get(firstLeg.getSteps().size() - 1).getManeuver().asPosition());
158158

159159
Assert.assertEquals(firstLeg.getDistance(), routeLegProgress.getDistanceTraveled(), BaseTest.DELTA);
@@ -162,14 +162,14 @@ public void getDistanceTraveled_equalsLegDistanceAtEndOfLeg() {
162162
@Test
163163
public void getDurationRemaining_equalsLegDurationAtBeginning() {
164164
RouteLegProgress routeLegProgress
165-
= new RouteLegProgress(firstLeg, 0, firstLeg.getSteps().get(0).getManeuver().asPosition());
165+
= RouteLegProgress.create(firstLeg, 0, firstLeg.getSteps().get(0).getManeuver().asPosition());
166166

167167
Assert.assertEquals(3535.2, routeLegProgress.getDurationRemaining(), BaseTest.DELTA);
168168
}
169169

170170
@Test
171171
public void getDurationRemaining_equalsZeroAtEndOfLeg() {
172-
RouteLegProgress routeLegProgress = new RouteLegProgress(firstLeg, firstLeg.getSteps().size() - 1,
172+
RouteLegProgress routeLegProgress = RouteLegProgress.create(firstLeg, firstLeg.getSteps().size() - 1,
173173
firstLeg.getSteps().get(firstLeg.getSteps().size() - 1).getManeuver().asPosition());
174174

175175
Assert.assertEquals(0, routeLegProgress.getDurationRemaining(), BaseTest.DELTA);

0 commit comments

Comments
 (0)