Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add Ride.Status #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
itstexter merged 3 commits into from
Oct 26, 2016
Merged

Add Ride.Status #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a910524
Add Ride.Status
Sep 21, 2016
001ded1
Fix RidesServiceTest
Sep 21, 2016
d5a7ad0
Add @Json annotations to Ride.Status values
Sep 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions sdk/src/main/java/com/uber/sdk/rides/client/model/Ride.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

package com.uber.sdk.rides.client.model;

import com.squareup.moshi.Json;

import javax.annotation.Nullable;

/**
Expand All @@ -31,8 +33,28 @@
*/
public class Ride {

/**
* Represents all possible Ride statuses
*/
public enum Status {
@Json(name = "processing") PROCESSING("processing"),
@Json(name = "no_drivers_available") NO_DRIVERS_AVAILABLE("no_drivers_available"),
@Json(name = "accepted") ACCEPTED("accepted"),
@Json(name = "arriving") ARRIVING("arriving"),
@Json(name = "in_progress") IN_PROGRESS("in_progress"),
@Json(name = "driver_canceled") DRIVER_CANCELED("driver_canceled"),
@Json(name = "rider_canceled") RIDER_CANCELED("rider_canceled"),
@Json(name = "completed") COMPLETED("completed");

private String value;

Status(String value) {
this.value = value;
}
}

private String request_id;
private String status;
private Status status;
private Driver driver;
@Nullable
private Integer eta;
Expand All @@ -52,7 +74,7 @@ public String getRideId() {
/**
* The status of the ride indicating state.
*/
public String getStatus() {
public Status getStatus() {
return status;
}

Expand Down
4 changes: 2 additions & 2 deletions sdk/src/test/java/com/uber/sdk/rides/client/services/RidesServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void testRequestRide_withoutProductId() throws Exception {

final Ride ride = service.requestRide(createRideRequest()).execute().body();

assertThat(ride.getStatus()).isEqualTo("processing");
assertThat(ride.getStatus()).isEqualTo(Ride.Status.PROCESSING);
assertThat(ride.getProductId()).isEqualTo(UBER_X_PRODUCT_ID);
assertThat(ride.getRideId()).isNotEmpty();
assertThat(ride.isShared()).isFalse();
Expand All @@ -149,7 +149,7 @@ public void testRequestRide_withUberPoolProductId() throws Exception {
.willReturn(aResponse().withBodyFile("requests_current_UberPool.json")));

final Ride ride = service.requestRide(createUberPoolRideRequest()).execute().body();
assertThat(ride.getStatus()).isEqualTo("processing");
assertThat(ride.getStatus()).isEqualTo(Ride.Status.PROCESSING);

assertThat(ride.getProductId()).isEqualTo(UBER_POOL_PRODUCT_ID);
assertThat(ride.getRideId()).isNotEmpty();
Expand Down