added tests with different fareMediaIds

Author: qcdyx

main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FareProductDefaultRiderCategoriesValidator.java

@@ -18,7 +18,6 @@ public class FareProductDefaultRiderCategoriesValidator extends FileValidator {
   HashMap<String, Integer> fareProductDefaultCount = new HashMap<>();
   Map<String, List<Integer>> fareProductRows = new HashMap<>();
   Map<String, List<String>> fareProductRiderCategories = new HashMap<>();
-  Set<String> riderCategoryIdSet = new HashSet<>();
 
   @Inject
   public FareProductDefaultRiderCategoriesValidator(
@@ -37,25 +36,21 @@ public boolean shouldCallValidate() {
   public void validate(NoticeContainer noticeContainer) {
     for (GtfsFareProduct fareProduct : fareProductTable.getEntities()) {
       String fareProductId = fareProduct.fareProductId();
-      if (!fareProductDefaultCount.containsKey(fareProductId)) {
-        String riderCategoryId = fareProduct.riderCategoryId();
-        Optional<GtfsRiderCategories> riderCategory =
-            riderCategoriesTable.byRiderCategoryId(riderCategoryId);
-        if (!riderCategory.isEmpty() && !riderCategoryIdSet.contains(riderCategoryId)) {
-          if (riderCategory
-              .get()
-              .isDefaultFareCategory()
-              .equals(GtfsRiderFareCategory.IS_DEFAULT)) {
-            fareProductDefaultCount.put(
-                fareProductId, fareProductDefaultCount.getOrDefault(fareProductId, 0) + 1);
-            fareProductRows
-                .computeIfAbsent(fareProductId, k -> new ArrayList<>())
-                .add(fareProduct.csvRowNumber());
-            fareProductRiderCategories
-                .computeIfAbsent(fareProductId, k -> new ArrayList<>())
-                .add(riderCategory.get().riderCategoryId());
-            riderCategoryIdSet.add(riderCategoryId);
-          }
+      String riderCategoryId = fareProduct.riderCategoryId();
+      Optional<GtfsRiderCategories> riderCategory =
+          riderCategoriesTable.byRiderCategoryId(riderCategoryId);
+      if (!riderCategory.isEmpty()) {
+        if (riderCategory.get().isDefaultFareCategory().equals(GtfsRiderFareCategory.IS_DEFAULT)) {
+          fareProductDefaultCount.put(
+              fareProductId, fareProductDefaultCount.getOrDefault(fareProductId, 0) + 1);
+          fareProductRows
+              .computeIfAbsent(fareProductId, k -> new ArrayList<>())
+              .add(fareProduct.csvRowNumber());
+          fareProductRiderCategories
+              .computeIfAbsent(fareProductId, k -> new ArrayList<>())
+              .add(riderCategory.get().riderCategoryId());
+          System.out.println("fareProductDefaultCount of " + fareProductId);
+          System.out.println(fareProductDefaultCount.get(fareProductId));
         }
       }
     }

main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FareProductDefaultRiderCategoriesValidatorTest.java

@@ -14,11 +14,12 @@
 @RunWith(JUnit4.class)
 public class FareProductDefaultRiderCategoriesValidatorTest {
   public static GtfsFareProduct createFareProduct(
-      int csvRowNumber, String fareId, String riderCategoryId) {
+      int csvRowNumber, String fareId, String riderCategoryId, String fareMediaId) {
     return new GtfsFareProduct.Builder()
         .setCsvRowNumber(csvRowNumber)
         .setFareProductId(fareId)
         .setRiderCategoryId(riderCategoryId)
+            .setFareMediaId(fareMediaId)
         .build();
   }
 
@@ -50,8 +51,8 @@ public void testMultipleDefaultRiderCategoriesShouldTriggerNotice() {
     riderCategories.add(createRiderCategories(2, "rider3", GtfsRiderFareCategory.NOT_DEFAULT));
 
     List<GtfsFareProduct> fareProducts = new ArrayList<>();
-    fareProducts.add(createFareProduct(1, "fare1", "rider1"));
-    fareProducts.add(createFareProduct(2, "fare1", "rider2"));
+    fareProducts.add(createFareProduct(1, "fare1", "rider1", "fareMediaId"));
+    fareProducts.add(createFareProduct(2, "fare1", "rider2", "fareMediaId"));
     assertThat(
         generateNotices(fareProducts, riderCategories)
             .contains(
@@ -67,8 +68,50 @@ public void testOneDefaultRiderCategoryShouldNotTriggerNotice() {
     riderCategories.add(createRiderCategories(2, "rider3", GtfsRiderFareCategory.NOT_DEFAULT));
 
     List<GtfsFareProduct> fareProducts = new ArrayList<>();
-    fareProducts.add(createFareProduct(1, "fare1", "rider1"));
-    fareProducts.add(createFareProduct(2, "fare1", "rider2"));
+    fareProducts.add(createFareProduct(1, "fare1", "rider1", "fareMediaId"));
+    fareProducts.add(createFareProduct(2, "fare1", "rider2", "fareMediaId"));
+    assertThat(generateNotices(fareProducts, riderCategories).isEmpty());
+  }
+
+  @Test
+  public void testDefaultRiderCategoriesWithDifferentFareProductIdsShouldNotTriggerNotice() {
+    List<GtfsRiderCategories> riderCategories = new ArrayList<>();
+    riderCategories.add(createRiderCategories(1, "rider1", GtfsRiderFareCategory.IS_DEFAULT));
+    riderCategories.add(createRiderCategories(2, "rider2", GtfsRiderFareCategory.NOT_DEFAULT));
+    riderCategories.add(createRiderCategories(3, "rider3", GtfsRiderFareCategory.NOT_DEFAULT));
+
+    List<GtfsFareProduct> fareProducts = new ArrayList<>();
+    fareProducts.add(createFareProduct(1, "fare1", "rider1", "fareMediaId"));
+    fareProducts.add(createFareProduct(2, "fare2", "rider1", "fareMediaId"));
+    assertThat(generateNotices(fareProducts, riderCategories).isEmpty());
+  }
+
+  @Test
+  public void testDefaultRiderCategoriesWithDifferentFareProductIdsShouldTriggerNotice() {
+    List<GtfsRiderCategories> riderCategories = new ArrayList<>();
+    riderCategories.add(createRiderCategories(1, "rider1", GtfsRiderFareCategory.IS_DEFAULT));
+    riderCategories.add(createRiderCategories(2, "rider2", GtfsRiderFareCategory.IS_DEFAULT));
+    riderCategories.add(createRiderCategories(3, "rider3", GtfsRiderFareCategory.NOT_DEFAULT));
+
+    List<GtfsFareProduct> fareProducts = new ArrayList<>();
+    fareProducts.add(createFareProduct(1, "fare1", "rider1","fareMediaId"));
+    fareProducts.add(createFareProduct(2, "fare2", "rider1","fareMediaId"));
+    fareProducts.add(createFareProduct(3, "fare2", "rider2","fareMediaId"));
+    assertThat(generateNotices(fareProducts, riderCategories).contains(
+            FareProductDefaultRiderCategoriesValidator
+                    .FareProductWithMultipleDefaultRiderCategoriesNotice.class));
+  }
+
+  @Test
+  public void testDefaultRiderCategoriesWithSameFareProductIdAndDifferentFareMediaIdsShouldNotTriggerNotice() {
+    List<GtfsRiderCategories> riderCategories = new ArrayList<>();
+    riderCategories.add(createRiderCategories(1, "rider1", GtfsRiderFareCategory.IS_DEFAULT));
+    riderCategories.add(createRiderCategories(2, "rider2", GtfsRiderFareCategory.NOT_DEFAULT));
+    riderCategories.add(createRiderCategories(3, "rider3", GtfsRiderFareCategory.NOT_DEFAULT));
+
+    List<GtfsFareProduct> fareProducts = new ArrayList<>();
+    fareProducts.add(createFareProduct(1, "fare1", "rider1", "fareMediaId1"));
+    fareProducts.add(createFareProduct(2, "fare1", "rider1", "fareMediaId2"));
     assertThat(generateNotices(fareProducts, riderCategories).isEmpty());
   }
 }