test/java/time/tck/java/time/chrono/TestHijrahChronology.java

Print this page

        

@@ -52,43 +52,44 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package tck.java.time.calendar;
+package tck.java.time.chrono;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
-import java.time.calendar.HijrahChrono;
-import java.time.temporal.ChronoLocalDate;
+import java.time.chrono.HijrahChronology;
+import java.time.chrono.HijrahDate;
+import java.time.chrono.ChronoLocalDate;
 import java.time.temporal.Adjusters;
-import java.time.temporal.Chrono;
-import java.time.temporal.ISOChrono;
+import java.time.chrono.Chronology;
+import java.time.chrono.IsoChronology;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 /**
  * Test.
  */
 @Test
-public class TestHijrahChrono {
+public class TestHijrahChronology {
 
     //-----------------------------------------------------------------------
-    // Chrono.ofName("Hijrah")  Lookup by name
+    // Chronology.ofName("Hijrah")  Lookup by name
     //-----------------------------------------------------------------------
     @Test(groups={"tck"})
     public void test_chrono_byName() {
-        Chrono<HijrahChrono> c = HijrahChrono.INSTANCE;
-        Chrono<?> test = Chrono.of("Hijrah");
+        Chronology c = HijrahChronology.INSTANCE;
+        Chronology test = Chronology.of("Hijrah");
         Assert.assertNotNull(test, "The Hijrah calendar could not be found byName");
         Assert.assertEquals(test.getId(), "Hijrah", "ID mismatch");
         Assert.assertEquals(test.getCalendarType(), "islamicc", "Type mismatch");
         Assert.assertEquals(test, c);
     }

@@ -97,35 +98,35 @@
     // creation, toLocalDate()
     //-----------------------------------------------------------------------
     @DataProvider(name="samples")
     Object[][] data_samples() {
         return new Object[][] {
-            {HijrahChrono.INSTANCE.date(1, 1, 1), LocalDate.of(622, 7, 19)},
-            {HijrahChrono.INSTANCE.date(1, 1, 2), LocalDate.of(622, 7, 20)},
-            {HijrahChrono.INSTANCE.date(1, 1, 3), LocalDate.of(622, 7, 21)},
-
-            {HijrahChrono.INSTANCE.date(2, 1, 1), LocalDate.of(623, 7, 8)},
-            {HijrahChrono.INSTANCE.date(3, 1, 1), LocalDate.of(624, 6, 27)},
-            {HijrahChrono.INSTANCE.date(3, 12, 6), LocalDate.of(625, 5, 23)},
-            {HijrahChrono.INSTANCE.date(4, 1, 1), LocalDate.of(625, 6, 16)},
-            {HijrahChrono.INSTANCE.date(4, 7, 3), LocalDate.of(625, 12, 12)},
-            {HijrahChrono.INSTANCE.date(4, 7, 4), LocalDate.of(625, 12, 13)},
-            {HijrahChrono.INSTANCE.date(5, 1, 1), LocalDate.of(626, 6, 5)},
-            {HijrahChrono.INSTANCE.date(1662, 3, 3), LocalDate.of(2234, 4, 3)},
-            {HijrahChrono.INSTANCE.date(1728, 10, 28), LocalDate.of(2298, 12, 03)},
-            {HijrahChrono.INSTANCE.date(1728, 10, 29), LocalDate.of(2298, 12, 04)},
+            {HijrahChronology.INSTANCE.date(1, 1, 1), LocalDate.of(622, 7, 19)},
+            {HijrahChronology.INSTANCE.date(1, 1, 2), LocalDate.of(622, 7, 20)},
+            {HijrahChronology.INSTANCE.date(1, 1, 3), LocalDate.of(622, 7, 21)},
+
+            {HijrahChronology.INSTANCE.date(2, 1, 1), LocalDate.of(623, 7, 8)},
+            {HijrahChronology.INSTANCE.date(3, 1, 1), LocalDate.of(624, 6, 27)},
+            {HijrahChronology.INSTANCE.date(3, 12, 6), LocalDate.of(625, 5, 23)},
+            {HijrahChronology.INSTANCE.date(4, 1, 1), LocalDate.of(625, 6, 16)},
+            {HijrahChronology.INSTANCE.date(4, 7, 3), LocalDate.of(625, 12, 12)},
+            {HijrahChronology.INSTANCE.date(4, 7, 4), LocalDate.of(625, 12, 13)},
+            {HijrahChronology.INSTANCE.date(5, 1, 1), LocalDate.of(626, 6, 5)},
+            {HijrahChronology.INSTANCE.date(1662, 3, 3), LocalDate.of(2234, 4, 3)},
+            {HijrahChronology.INSTANCE.date(1728, 10, 28), LocalDate.of(2298, 12, 03)},
+            {HijrahChronology.INSTANCE.date(1728, 10, 29), LocalDate.of(2298, 12, 04)},
         };
     }
 
     @Test(dataProvider="samples", groups={"tck"})
     public void test_toLocalDate(ChronoLocalDate<?> hijrahDate, LocalDate iso) {
         assertEquals(LocalDate.from(hijrahDate), iso);
     }
 
     @Test(dataProvider="samples", groups={"tck"})
     public void test_fromCalendrical(ChronoLocalDate<?> hijrahDate, LocalDate iso) {
-        assertEquals(HijrahChrono.INSTANCE.date(iso), hijrahDate);
+        assertEquals(HijrahChronology.INSTANCE.date(iso), hijrahDate);
     }
 
     @DataProvider(name="badDates")
     Object[][] data_badDates() {
         return new Object[][] {

@@ -146,74 +147,74 @@
         };
     }
 
     @Test(dataProvider="badDates", groups={"tck"}, expectedExceptions=DateTimeException.class)
     public void test_badDates(int year, int month, int dom) {
-        HijrahChrono.INSTANCE.date(year, month, dom);
+        HijrahChronology.INSTANCE.date(year, month, dom);
     }
 
     //-----------------------------------------------------------------------
     // with(WithAdjuster)
     //-----------------------------------------------------------------------
     @Test(groups={"tck"})
     public void test_adjust1() {
-        ChronoLocalDate<?> base = HijrahChrono.INSTANCE.date(1728, 10, 28);
+        ChronoLocalDate<?> base = HijrahChronology.INSTANCE.date(1728, 10, 28);
         ChronoLocalDate<?> test = base.with(Adjusters.lastDayOfMonth());
-        assertEquals(test, HijrahChrono.INSTANCE.date(1728, 10, 29));
+        assertEquals(test, HijrahChronology.INSTANCE.date(1728, 10, 29));
     }
 
     @Test(groups={"tck"})
     public void test_adjust2() {
-        ChronoLocalDate<?> base = HijrahChrono.INSTANCE.date(1728, 12, 2);
+        ChronoLocalDate<?> base = HijrahChronology.INSTANCE.date(1728, 12, 2);
         ChronoLocalDate<?> test = base.with(Adjusters.lastDayOfMonth());
-        assertEquals(test, HijrahChrono.INSTANCE.date(1728, 12, 30));
+        assertEquals(test, HijrahChronology.INSTANCE.date(1728, 12, 30));
     }
 
     //-----------------------------------------------------------------------
     // HijrahDate.with(Local*)
     //-----------------------------------------------------------------------
     @Test(groups={"tck"})
     public void test_adjust_toLocalDate() {
-        ChronoLocalDate<?> hijrahDate = HijrahChrono.INSTANCE.date(1726, 1, 4);
+        ChronoLocalDate<?> hijrahDate = HijrahChronology.INSTANCE.date(1726, 1, 4);
         ChronoLocalDate<?> test = hijrahDate.with(LocalDate.of(2012, 7, 6));
-        assertEquals(test, HijrahChrono.INSTANCE.date(1433, 8, 16));
+        assertEquals(test, HijrahChronology.INSTANCE.date(1433, 8, 16));
     }
 
     @Test(groups={"tck"}, expectedExceptions=DateTimeException.class)
     public void test_adjust_toMonth() {
-        ChronoLocalDate<?> hijrahDate = HijrahChrono.INSTANCE.date(1726, 1, 4);
+        ChronoLocalDate<?> hijrahDate = HijrahChronology.INSTANCE.date(1726, 1, 4);
         hijrahDate.with(Month.APRIL);
     }
 
     //-----------------------------------------------------------------------
     // LocalDate.with(HijrahDate)
     //-----------------------------------------------------------------------
     @Test(groups={"tck"})
     public void test_LocalDate_adjustToHijrahDate() {
-        ChronoLocalDate<?> hijrahDate = HijrahChrono.INSTANCE.date(1728, 10, 29);
+        ChronoLocalDate<?> hijrahDate = HijrahChronology.INSTANCE.date(1728, 10, 29);
         LocalDate test = LocalDate.MIN.with(hijrahDate);
         assertEquals(test, LocalDate.of(2298, 12, 4));
     }
 
     @Test(groups={"tck"})
     public void test_LocalDateTime_adjustToHijrahDate() {
-        ChronoLocalDate<?> hijrahDate = HijrahChrono.INSTANCE.date(1728, 10, 29);
+        ChronoLocalDate<?> hijrahDate = HijrahChronology.INSTANCE.date(1728, 10, 29);
         LocalDateTime test = LocalDateTime.MIN.with(hijrahDate);
         assertEquals(test, LocalDateTime.of(2298, 12, 4, 0, 0));
     }
 
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
     @DataProvider(name="toString")
     Object[][] data_toString() {
         return new Object[][] {
-            {HijrahChrono.INSTANCE.date(1, 1, 1), "Hijrah AH 1-01-01"},
-            {HijrahChrono.INSTANCE.date(1728, 10, 28), "Hijrah AH 1728-10-28"},
-            {HijrahChrono.INSTANCE.date(1728, 10, 29), "Hijrah AH 1728-10-29"},
-            {HijrahChrono.INSTANCE.date(1727, 12, 5), "Hijrah AH 1727-12-05"},
-            {HijrahChrono.INSTANCE.date(1727, 12, 6), "Hijrah AH 1727-12-06"},
+            {HijrahChronology.INSTANCE.date(1, 1, 1), "Hijrah AH 1-01-01"},
+            {HijrahChronology.INSTANCE.date(1728, 10, 28), "Hijrah AH 1728-10-28"},
+            {HijrahChronology.INSTANCE.date(1728, 10, 29), "Hijrah AH 1728-10-29"},
+            {HijrahChronology.INSTANCE.date(1727, 12, 5), "Hijrah AH 1727-12-05"},
+            {HijrahChronology.INSTANCE.date(1727, 12, 6), "Hijrah AH 1727-12-06"},
         };
     }
 
     @Test(dataProvider="toString", groups={"tck"})
     public void test_toString(ChronoLocalDate<?> hijrahDate, String expected) {

@@ -223,14 +224,14 @@
     //-----------------------------------------------------------------------
     // equals()
     //-----------------------------------------------------------------------
     @Test(groups="tck")
     public void test_equals_true() {
-        assertTrue(HijrahChrono.INSTANCE.equals(HijrahChrono.INSTANCE));
+        assertTrue(HijrahChronology.INSTANCE.equals(HijrahChronology.INSTANCE));
     }
 
     @Test(groups="tck")
     public void test_equals_false() {
-        assertFalse(HijrahChrono.INSTANCE.equals(ISOChrono.INSTANCE));
+        assertFalse(HijrahChronology.INSTANCE.equals(IsoChronology.INSTANCE));
     }
 
 }