more kshaia tuning

see issue #851
MenoData · Jul 12, 2020 · 402990a · 402990a
1 parent 9df9298
commit 402990a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/base/src/main/java/net/time4j/calendar/hindu/HinduCalendar.java b/base/src/main/java/net/time4j/calendar/hindu/HinduCalendar.java
@@ -1631,7 +1631,11 @@ public boolean isValid(
                 }
             }
 
-            return true;
+            if (context.variant.isLunisolar() && !context.variant.isOld()) {
+                return !context.variant.getCalendarSystem().isExpunged(context.kyYear, value);
+            } else {
+                return true;
+            }
         }
 
         @Override

diff --git a/base/src/test/java/net/time4j/calendar/hindu/HinduMiscellaneousTest.java b/base/src/test/java/net/time4j/calendar/hindu/HinduMiscellaneousTest.java
@@ -81,7 +81,9 @@ public void minmaxAmantaAshadha() {
         assertThat(min.getYear(), is(1200));
         assertThat(max.getYear(), is(5999));
         assertThat(min.getMonth(), is(HinduMonth.of(IndianMonth.ASHADHA)));
+        assertThat(min.getMonth(), is(min.getMinimum(HinduCalendar.MONTH_OF_YEAR)));
         assertThat(max.getMonth(), is(HinduMonth.ofLunisolar(3)));
+        assertThat(max.getMonth(), is(max.getMaximum(HinduCalendar.MONTH_OF_YEAR)));
         assertThat(min.getDayOfMonth(), is(HinduDay.valueOf(1)));
         assertThat(min.getDayOfMonth(), is(min.getMinimum(HinduCalendar.DAY_OF_MONTH)));
         assertThat(max.getDayOfMonth(), is(HinduDay.valueOf(30)));
@@ -112,7 +114,9 @@ public void minmaxAmantaKartika() {
         assertThat(min.getYear(), is(1200));
         assertThat(max.getYear(), is(5999));
         assertThat(min.getMonth(), is(HinduMonth.of(IndianMonth.KARTIKA)));
+        assertThat(min.getMonth(), is(min.getMinimum(HinduCalendar.MONTH_OF_YEAR)));
         assertThat(max.getMonth(), is(HinduMonth.ofLunisolar(7)));
+        assertThat(max.getMonth(), is(max.getMaximum(HinduCalendar.MONTH_OF_YEAR)));
         assertThat(min.getDayOfMonth(), is(HinduDay.valueOf(2)));
         assertThat(min.getDayOfMonth(), is(min.getMinimum(HinduCalendar.DAY_OF_MONTH)));
         assertThat(max.getDayOfMonth(), is(HinduDay.valueOf(30)));
@@ -303,6 +307,20 @@ public void kshaia2() {
             is(expected));
     }
 
+    @Test
+    public void kshaia3() {
+        HinduCalendar cal = PlainDate.of(1983, 1, 20).transform(HinduCalendar.family(), HinduRule.AMANTA.variant());
+        assertThat(cal.getMonth(), is(HinduMonth.ofLunisolar(10)));
+        assertThat(cal.isValid(HinduCalendar.MONTH_OF_YEAR, HinduMonth.ofLunisolar(11)), is(false));
+
+        try {
+            cal.with(HinduCalendar.MONTH_OF_YEAR, HinduMonth.ofLunisolar(11));
+            fail("Setting a kshaia month should fail but succeeded.");
+        } catch (IllegalArgumentException iae) {
+            assertThat(iae.getMessage(), is("Invalid month: MAGHA"));
+        }
+    }
+
     @Test
     public void amantaMonthSequence1982() { // CC: page 341, with two leap months and a lost month
         HinduCalendar cal = PlainDate.of(1982, 3, 14).transform(HinduCalendar.family(), HinduRule.AMANTA.variant());