Skip to content

fix: Fixes issue 1447, NullPointerException when querying number of cars #1459

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

Open
fvilarino wants to merge 1 commit into
base: main
Choose a base branch
from
+166 −2
Open

fix: Fixes issue 1447, NullPointerException when querying number of cars #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
163 changes: 163 additions & 0 deletions ...saway-android/src/androidTest/java/org/onebusaway/android/io/test/ObaArrivalInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
package org.onebusaway.android.io.test;

import org.junit.Test;
import org.onebusaway.android.app.Application;
import org.onebusaway.android.io.JacksonSerializer;
import org.onebusaway.android.io.elements.ObaArrivalInfo;
import org.onebusaway.android.io.elements.ObaRegion;
import org.onebusaway.android.io.elements.Occupancy;
import org.onebusaway.android.mock.MockRegion;

import android.content.Context;

import androidx.test.platform.app.InstrumentationRegistry;

import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;

public class ObaArrivalInfoTest extends ObaTestCase {

private final Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();

@Test
public void testGetPredicted_PredictedNull_PredictedArrivalTimeSet() {
String json = "{\"predictedArrivalTime\": 123456789}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
assertTrue(info.getPredicted());
}

@Test
public void testGetPredicted_PredictedNull_PredictedDepartureTimeSet() {
String json = "{\"predictedDepartureTime\": 123456789}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
assertTrue(info.getPredicted());
}

@Test
public void testGetPredicted_PredictedNull_BothTimesZero() {
String json = "{}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
assertFalse(info.getPredicted());
}

@Test
public void testGetPredicted_PredictedTrue_PredictedArrivalTimeSet() {
String json = "{\"predicted\": true, \"predictedArrivalTime\": 123456789}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
assertTrue(info.getPredicted());
}

@Test
public void testGetPredicted_PredictedTrue_BothTimesZero() {
String json = "{\"predicted\": true}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
assertFalse(info.getPredicted());
}

@Test
public void testGetPredicted_PredictedFalse() {
String json = "{\"predicted\": false, \"predictedArrivalTime\": 123456789}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
assertFalse(info.getPredicted());
}

@Test
public void testGetNumCars_PugetSound_TwoCars() {
ObaRegion ps = MockRegion.getPugetSound(context);
Application.get().setCurrentRegion(ps);

String json = "{\"vehicleId\": \"Train[123-456]\"}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);

String numCars = info.getNumCars(context);
assertNotNull(numCars);
assertTrue(numCars.contains("2"));
}

@Test
public void testGetNumCars_PugetSound_ThreeCars() {
ObaRegion ps = MockRegion.getPugetSound(context);
Application.get().setCurrentRegion(ps);

String json = "{\"vehicleId\": \"Train[123-456-789]\"}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
String numCars = info.getNumCars(context);
assertNotNull(numCars);
assertTrue(numCars.contains("3"));
}

@Test
public void testGetNumCars_PugetSound_InvalidFormat() {
ObaRegion ps = MockRegion.getPugetSound(context);
Application.get().setCurrentRegion(ps);

String json = "{\"vehicleId\": \"Train123\"}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
String numCars = info.getNumCars(context);
assertNull(numCars);
}

@Test
public void testGetNumCars_NonPugetSound() {
ObaRegion tampa = MockRegion.getTampa(context);
Application.get().setCurrentRegion(tampa);

String json = "{\"vehicleId\": \"Train[123-456]\"}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
String numCars = info.getNumCars(context);
assertNull(numCars);
}

@Test
public void testGetNumCars_NullRegion() {
Application.get().setCurrentRegion(null);
String json = "{\"vehicleId\": \"Train[123-456]\"}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
String numCars = info.getNumCars(context);
assertNull(numCars);
}

@Test
public void testGetOccupancy_BothSet() {
String json = "{\"historicalOccupancy\": \"MANY_SEATS_AVAILABLE\", " +
"\"occupancyStatus\": \"STANDING_ROOM_ONLY\"}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);

assertEquals(Occupancy.MANY_SEATS_AVAILABLE, info.getHistoricalOccupancy());
assertEquals(Occupancy.STANDING_ROOM_ONLY, info.getOccupancyStatus());
}

@Test
public void testGetOccupancy_UnknownHistorical() {
String json = "{\"historicalOccupancy\": \"unknown\", \"occupancyStatus\": \"FULL\"}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);

assertNull(info.getHistoricalOccupancy());
assertEquals(Occupancy.FULL, info.getOccupancyStatus());
}

@Test
public void testGetOccupancy_Null() {
String json = "{}";
ObaArrivalInfo info = JacksonSerializer.getInstance()
.deserializeFromResponse(json, ObaArrivalInfo.class);
assertNull(info.getHistoricalOccupancy());
assertNull(info.getOccupancyStatus());
}
}
5 changes: 3 additions & 2 deletions onebusaway-android/src/main/java/org/onebusaway/android/io/elements/ObaArrivalInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ public long getHeadway() {

private final String occupancyStatus;

private static final String PUGET_SOUND_REGION_NAME = "Puget Sound";

ObaArrivalInfo() {
routeId = "";
routeShortName = "";
Expand Down Expand Up @@ -360,8 +362,7 @@ public Occupancy getOccupancyStatus() {
public String getNumCars(Context context) {
ObaRegion currentRegion = Application.get().getCurrentRegion();
if(currentRegion == null) return null;
boolean isPugetSoundRegion = currentRegion
.getName().equals("Puget Sound");
boolean isPugetSoundRegion = PUGET_SOUND_REGION_NAME.equals(currentRegion.getName());
boolean vehicleIdAvailable = this.getVehicleId() != null;
if (!vehicleIdAvailable || !isPugetSoundRegion) {
return null;
Expand Down