Use constants for media

Author: leonardehrenfried

application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactoryTest.java

@@ -3,9 +3,9 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.opentripplanner.ext.fares.service.gtfs.v2.custom.OregonHopFareFactory.ADULT_REGIONAL_SINGLE_RIDE;
 import static org.opentripplanner.ext.fares.service.gtfs.v2.custom.OregonHopFareFactory.CATEGORY_ADULT;
+import static org.opentripplanner.ext.fares.service.gtfs.v2.custom.OregonHopFareFactory.HOP_FASTPASS;
 import static org.opentripplanner.ext.fares.service.gtfs.v2.custom.OregonHopFareFactory.LG_CTRAN_REGIONAL;
 import static org.opentripplanner.ext.fares.service.gtfs.v2.custom.OregonHopFareFactory.LG_TRIMET_TRIMET;
-import static org.opentripplanner.ext.fares.service.gtfs.v2.custom.OregonHopFareFactory.MEDIUM_HOP_FASTPASS;
 import static org.opentripplanner.ext.fares.service.gtfs.v2.custom.OregonHopFareFactory.TRIMET_ADULT_SINGLE_RIDE;
 import static org.opentripplanner.transit.model._data.FeedScopedIdForTestFactory.id;
 
@@ -46,7 +46,7 @@ class OregonHopFareFactoryTest implements FareTestConstants {
     FP_CTRAN_REGIONAL.price()
   )
     .withCategory(CATEGORY_ADULT)
-    .withMedium(MEDIUM_HOP_FASTPASS)
+    .withMedium(HOP_FASTPASS)
     .build();
 
   @Test

application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java

@@ -55,7 +55,12 @@ public class OregonHopFareFactory extends DefaultFareServiceFactory {
     .build();
 
   // fare media
-  static final FareMedium MEDIUM_HOP_FASTPASS = new FareMedium(ctranId("2"), "HOP Fastpass");
+  static final FareMedium HOP_FASTPASS = new FareMedium(ctranId("2"), "HOP Fastpass");
+  static final FareMedium VIRTUAL_HOP_FASTPASS = new FareMedium(
+    ctranId("4"),
+    "Virtual HOP Fastpass"
+  );
+  static final FareMedium OPEN_PAYMENT = new FareMedium(ctranId("3"), "Open Payment");
 
   public FareService makeFareService() {
     DefaultFareService fareService = new DefaultFareService();
@@ -491,7 +496,7 @@ private Collection<FareProduct> generateHopFareProducts(
         Money.max(Money.ZERO_USD, adultLarger.minus(adultSmaller))
       )
         .withCategory(CATEGORY_ADULT)
-        .withMedium(MEDIUM_HOP_FASTPASS)
+        .withMedium(HOP_FASTPASS)
         .build()
     );
     hopFareProducts.add(
@@ -501,7 +506,7 @@ private Collection<FareProduct> generateHopFareProducts(
         Money.max(Money.ZERO_USD, adultLarger.minus(adultSmaller))
       )
         .withCategory(CATEGORY_ADULT)
-        .withMedium(new FareMedium(ctranId("3"), "Open Payment"))
+        .withMedium(OPEN_PAYMENT)
         .build()
     );
     hopFareProducts.add(
@@ -511,7 +516,7 @@ private Collection<FareProduct> generateHopFareProducts(
         Money.max(Money.ZERO_USD, adultLarger.minus(adultSmaller))
       )
         .withCategory(CATEGORY_ADULT)
-        .withMedium(new FareMedium(ctranId("4"), "Virtual HOP Fastpass"))
+        .withMedium(VIRTUAL_HOP_FASTPASS)
         .build()
     );
 
@@ -523,7 +528,7 @@ private Collection<FareProduct> generateHopFareProducts(
         Money.max(Money.ZERO_USD, (seniorLarger.minus(seniorSmaller)))
       )
         .withCategory(CATEGORY_HONOURED_CITIZEN)
-        .withMedium(MEDIUM_HOP_FASTPASS)
+        .withMedium(HOP_FASTPASS)
         .build()
     );
     hopFareProducts.add(
@@ -533,7 +538,7 @@ private Collection<FareProduct> generateHopFareProducts(
         Money.max(Money.ZERO_USD, seniorLarger.minus(seniorSmaller))
       )
         .withCategory(CATEGORY_HONOURED_CITIZEN)
-        .withMedium(new FareMedium(ctranId("3"), "Open Payment"))
+        .withMedium(OPEN_PAYMENT)
         .build()
     );
     hopFareProducts.add(
@@ -543,7 +548,7 @@ private Collection<FareProduct> generateHopFareProducts(
         Money.max(Money.ZERO_USD, seniorLarger.minus(seniorSmaller))
       )
         .withCategory(CATEGORY_HONOURED_CITIZEN)
-        .withMedium(new FareMedium(ctranId("4"), "Virtual HOP Fastpass"))
+        .withMedium(VIRTUAL_HOP_FASTPASS)
         .build()
     );
 
@@ -555,7 +560,7 @@ private Collection<FareProduct> generateHopFareProducts(
         Money.max(Money.ZERO_USD, youthLarger.minus(youthSmaller))
       )
         .withCategory(CATEGORY_YOUTH)
-        .withMedium(MEDIUM_HOP_FASTPASS)
+        .withMedium(HOP_FASTPASS)
         .build()
     );
     hopFareProducts.add(
@@ -565,7 +570,7 @@ private Collection<FareProduct> generateHopFareProducts(
         Money.max(Money.ZERO_USD, youthLarger.minus(youthSmaller))
       )
         .withCategory(CATEGORY_YOUTH)
-        .withMedium(new FareMedium(ctranId("3"), "Open Payment"))
+        .withMedium(OPEN_PAYMENT)
         .build()
     );
     hopFareProducts.add(
@@ -575,7 +580,7 @@ private Collection<FareProduct> generateHopFareProducts(
         Money.max(Money.ZERO_USD, youthLarger.minus(youthSmaller))
       )
         .withCategory(CATEGORY_YOUTH)
-        .withMedium(new FareMedium(ctranId("4"), "Virtual HOP Fastpass"))
+        .withMedium(VIRTUAL_HOP_FASTPASS)
         .build()
     );