when_exe 0.4.2 → 0.5.0

data/test/test/region/discordian.rb

@@ -1,20 +1,20 @@
-# -*- coding: utf-8 -*-
-=begin
-  Copyright (C) 2014 Takashi SUGA
-
-  You may use and/or modify this file according to the license
-  described in the LICENSE.txt file included in this archive.
-=end
-
-module MiniTest
-
-  class Discordian < MiniTest::TestCase
-    def test_discordian
-      date = When.when? '2001.1.1'
-      400.times do |i|
-        assert_equal([2001+i+1166,1,1], (When::Discordian ^ date).cal_date)
-        date += When::P1Y
-      end
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2014 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module MiniTest
+
+  class Discordian < MiniTest::TestCase
+    def test_discordian
+      date = When.when? '2001.1.1'
+      400.times do |i|
+        assert_equal([2001+i+1166,1,1], (When::Discordian ^ date).cal_date)
+        date += When::P1Y
+      end
+    end
+  end
+end

data/test/test/region/french.rb

@@ -1,33 +1,33 @@
-# -*- coding: utf-8 -*-
-=begin
-  Copyright (C) 2012 Takashi SUGA
-
-  You may use and/or modify this file according to the license
-  described in the LICENSE.txt file included in this archive.
-=end
-
-module MiniTest
-
-  class FrenchRepublican < MiniTest::TestCase
-    def test__french_republican
-      date = When.when? '1.1.1^^FrenchRepublican'
-      [["0001-01-01", 2375840],
-       ["0002-01-01", 2376205],
-       ["0003-01-01", 2376570],
-       ["0004-01-01", 2376936],
-       ["0005-01-01", 2377301],
-       ["0006-01-01", 2377666],
-       ["0007-01-01", 2378031],
-       ["0008-01-01", 2378397],
-       ["0009-01-01", 2378762],
-       ["0010-01-01", 2379127],
-       ["0011-01-01", 2379492],
-       ["0012-01-01", 2379858],
-       ["0013-01-01", 2380223],
-       ["0014-01-01", 2380588]].each do |sample|
-        assert_equal(sample, [date.to_s, date.to_i])
-        date += When::P1Y
-      end
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2012 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module MiniTest
+
+  class FrenchRepublican < MiniTest::TestCase
+    def test__french_republican
+      date = When.when? '1.1.1^^FrenchRepublican'
+      [["0001-01-01", 2375840],
+       ["0002-01-01", 2376205],
+       ["0003-01-01", 2376570],
+       ["0004-01-01", 2376936],
+       ["0005-01-01", 2377301],
+       ["0006-01-01", 2377666],
+       ["0007-01-01", 2378031],
+       ["0008-01-01", 2378397],
+       ["0009-01-01", 2378762],
+       ["0010-01-01", 2379127],
+       ["0011-01-01", 2379492],
+       ["0012-01-01", 2379858],
+       ["0013-01-01", 2380223],
+       ["0014-01-01", 2380588]].each do |sample|
+        assert_equal(sample, [date.to_s, date.to_i])
+        date += When::P1Y
+      end
+    end
+  end
+end

data/test/test/region/geologicalage.rb

@@ -1,17 +1,17 @@
-# -*- coding: utf-8 -*-
-=begin
-  Copyright (C) 2011-2013 Takashi SUGA
-
-  You may use and/or modify this file according to the license
-  described in the LICENSE.txt file included in this archive.
-=end
-
-module MiniTest::TM
-  class GeologicalAge < MiniTest::TestCase
-    def test__geological_age
-      age = When.Resource('_tm:OrdinalReferenceSystem/GeologicalAge')
-      assert_equal("-2500000000", age['始生代::新始生代'].end.to_s)
-      assert_equal("-09700", age['顕生代::新生代::第四紀::完新世'].begin.to_s)
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2011-2015 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module MiniTest::TM
+  class GeologicalAge < MiniTest::TestCase
+    def test__geological_age
+      age = When.Resource('_tm:OrdinalReferenceSystem/GeologicalAge')
+      assert_equal("-2500000000", age['Archean::Neoarchean'].end.to_s)
+      assert_equal("-09700", age['Phanerozoic::Cenozoic::Quaternary::Holocene'].begin.to_s)
+    end
+  end
+end

data/test/test/region/indian.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2018 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -86,5 +86,18 @@ module MiniTest
       date = When.when? '1936-11%3C08-%5E%5eHinduLuniSolar?note=HinduNote&location=(_co:Indian::Chennai)&start_month=5&type=SBSA'
       assert_equal('1936-11<08-', date.to_s)
     end
+
+    def test_vikram_sambat
+      date = When.when? '1942.4.20'
+      mismatches = []
+      961.times do
+        sambat = (When::VikramSambatSolar ^ date).to_s
+        samvat = (When::VikramSamvatSolar ^ date).to_s
+        mismatches << [date.to_s, sambat, samvat] unless sambat == samvat
+        date += When::P1M
+      end
+      assert_equal([%w(1945-11-20 2002-08-06 2002-08-05)], mismatches)
+    end
+
   end
 end

data/test/test/region/iran.rb

@@ -1,54 +1,54 @@
-# -*- coding: utf-8 -*-
-=begin
-  Copyright (C) 2012 Takashi SUGA
-
-  You may use and/or modify this file according to the license
-  described in the LICENSE.txt file included in this archive.
-=end
-
-module MiniTest
-
-  class Iranian < MiniTest::TestCase
-    def test__iranian
-      date = When.when? 'AP1391.1.1'
-      [["Iranian::AH1391.01.01", 2456007], # (2012)
-       ["Iranian::AH1392.01.01", 2456373], # (2013)
-       ["Iranian::AH1393.01.01", 2456738], # (2014)
-       ["Iranian::AH1394.01.01", 2457103], # (2015)
-       ["Iranian::AH1395.01.01", 2457468], # (2016)
-       ["Iranian::AH1396.01.01", 2457834], # (2017)
-       ["Iranian::AH1397.01.01", 2458199], # (2018)
-       ["Iranian::AH1398.01.01", 2458564], # (2019)
-       ["Iranian::AH1399.01.01", 2458929], # (2020)
-       ["Iranian::AH1400.01.01", 2459295], # (2021)
-       ["Iranian::AH1401.01.01", 2459660], # (2022)
-       ["Iranian::AH1402.01.01", 2460025], # (2023)
-       ["Iranian::AH1403.01.01", 2460390], # (2024)
-       ["Iranian::AH1404.01.01", 2460756], # (2025)
-       ["Iranian::AH1405.01.01", 2461121], # (2026)
-       ["Iranian::AH1406.01.01", 2461486], # (2027)
-       ["Iranian::AH1407.01.01", 2461851], # (2028)
-       ["Iranian::AH1408.01.01", 2462216], # (2029)
-       ["Iranian::AH1409.01.01", 2462582], # (2030)
-       ["Iranian::AH1410.01.01", 2462947], # (2031)
-       ["Iranian::AH1411.01.01", 2463312], # (2032)
-       ["Iranian::AH1412.01.01", 2463677], # (2033)
-       ["Iranian::AH1413.01.01", 2464043], # (2034)
-       ["Iranian::AH1414.01.01", 2464408], # (2035)
-       ["Iranian::AH1415.01.01", 2464773], # (2036)
-       ["Iranian::AH1416.01.01", 2465138], # (2037)
-       ["Iranian::AH1417.01.01", 2465504], # (2038)
-       ["Iranian::AH1418.01.01", 2465869], # (2039)
-       ["Iranian::AH1419.01.01", 2466234], # (2040)
-       ["Iranian::AH1420.01.01", 2466599], # (2041)
-       ["Iranian::AH1421.01.01", 2466965], # (2042)
-       ["Iranian::AH1422.01.01", 2467330], # (2043)
-       ["Iranian::AH1423.01.01", 2467695], # (2044)
-       ["Iranian::AH1424.01.01", 2468060]  # (2045)
-      ].each do |sample|
-        assert_equal(sample, [date.to_s, date.to_i])
-        date += When.Duration('P1Y')
-      end
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2012 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module MiniTest
+
+  class Iranian < MiniTest::TestCase
+    def test__iranian
+      date = When.when? 'AP1391.1.1'
+      [["Iranian::AH1391.01.01", 2456007], # (2012)
+       ["Iranian::AH1392.01.01", 2456373], # (2013)
+       ["Iranian::AH1393.01.01", 2456738], # (2014)
+       ["Iranian::AH1394.01.01", 2457103], # (2015)
+       ["Iranian::AH1395.01.01", 2457468], # (2016)
+       ["Iranian::AH1396.01.01", 2457834], # (2017)
+       ["Iranian::AH1397.01.01", 2458199], # (2018)
+       ["Iranian::AH1398.01.01", 2458564], # (2019)
+       ["Iranian::AH1399.01.01", 2458929], # (2020)
+       ["Iranian::AH1400.01.01", 2459295], # (2021)
+       ["Iranian::AH1401.01.01", 2459660], # (2022)
+       ["Iranian::AH1402.01.01", 2460025], # (2023)
+       ["Iranian::AH1403.01.01", 2460390], # (2024)
+       ["Iranian::AH1404.01.01", 2460756], # (2025)
+       ["Iranian::AH1405.01.01", 2461121], # (2026)
+       ["Iranian::AH1406.01.01", 2461486], # (2027)
+       ["Iranian::AH1407.01.01", 2461851], # (2028)
+       ["Iranian::AH1408.01.01", 2462216], # (2029)
+       ["Iranian::AH1409.01.01", 2462582], # (2030)
+       ["Iranian::AH1410.01.01", 2462947], # (2031)
+       ["Iranian::AH1411.01.01", 2463312], # (2032)
+       ["Iranian::AH1412.01.01", 2463677], # (2033)
+       ["Iranian::AH1413.01.01", 2464043], # (2034)
+       ["Iranian::AH1414.01.01", 2464408], # (2035)
+       ["Iranian::AH1415.01.01", 2464773], # (2036)
+       ["Iranian::AH1416.01.01", 2465138], # (2037)
+       ["Iranian::AH1417.01.01", 2465504], # (2038)
+       ["Iranian::AH1418.01.01", 2465869], # (2039)
+       ["Iranian::AH1419.01.01", 2466234], # (2040)
+       ["Iranian::AH1420.01.01", 2466599], # (2041)
+       ["Iranian::AH1421.01.01", 2466965], # (2042)
+       ["Iranian::AH1422.01.01", 2467330], # (2043)
+       ["Iranian::AH1423.01.01", 2467695], # (2044)
+       ["Iranian::AH1424.01.01", 2468060]  # (2045)
+      ].each do |sample|
+        assert_equal(sample, [date.to_s, date.to_i])
+        date += When.Duration('P1Y')
+      end
+    end
+  end
+end

data/test/test/region/islamic.rb

@@ -1,54 +1,64 @@
-# -*- coding: utf-8 -*-
-=begin
-  Copyright (C) 2011-2014 Takashi SUGA
-
-  You may use and/or modify this file according to the license
-  described in the LICENSE.txt file included in this archive.
-=end
-
-module MiniTest
-
-  module CalendarTypes
-    class Islamic < MiniTest::TestCase
-
-      Sample = [
-        ["1435-01-01", 2456602],["1435-02-01", 2456632],["1435-03-01", 2456661],["1435-04-01", 2456691],
-        ["1435-05-01", 2456720],["1435-06-01", 2456750],["1435-07-01", 2456779],["1435-08-01", 2456809],
-        ["1435-09-01", 2456838],["1435-10-01", 2456868],["1435-11-01", 2456897],["1435-12-01", 2456927],
-
-        ["1436-01-01", 2456956],["1436-02-01", 2456986],["1436-03-01", 2457015],["1436-04-01", 2457045],
-        ["1436-05-01", 2457074],["1436-06-01", 2457104],["1436-07-01", 2457133],["1436-08-01", 2457163],
-        ["1436-09-01", 2457192],["1436-10-01", 2457222],["1436-11-01", 2457251],["1436-12-01", 2457281],
-
-        ["1437-01-01", 2457311],["1437-02-01", 2457341],["1437-03-01", 2457370],["1437-04-01", 2457400],
-        ["1437-05-01", 2457429],["1437-06-01", 2457459],["1437-07-01", 2457488],["1437-08-01", 2457518],
-        ["1437-09-01", 2457547],["1437-10-01", 2457577],["1437-11-01", 2457606],["1437-12-01", 2457636],
-
-
-        ["1435-01-01", 2456602],["1435-02-01", 2456631],["1435-03-01", 2456660],["1435-04-01", 2456690],
-        ["1435-05-01", 2456719],["1435-06-01", 2456749],["1435-07-01", 2456778],["1435-08-01", 2456808],
-        ["1435-09-01", 2456838],["1435-10-01", 2456868],["1435-11-01", 2456898],["1435-12-01", 2456927],
-
-        ["1436-01-01", 2456956],["1436-02-01", 2456986],["1436-03-01", 2457015],["1436-04-01", 2457044],
-        ["1436-05-01", 2457074],["1436-06-01", 2457103],["1436-07-01", 2457133],["1436-08-01", 2457162],
-        ["1436-09-01", 2457192],["1436-10-01", 2457222],["1436-11-01", 2457251],["1436-12-01", 2457281],
-
-        ["1437-01-01", 2457310],["1437-02-01", 2457340],["1437-03-01", 2457370],["1437-04-01", 2457399],
-        ["1437-05-01", 2457429],["1437-06-01", 2457458],["1437-07-01", 2457487],["1437-08-01", 2457517],
-        ["1437-09-01", 2457546],["1437-10-01", 2457576],["1437-11-01", 2457605],["1437-12-01", 2457635],
-      ]
-
-      def test_islamic_date
-        sample = Sample.dup
-        %w(TabularIslamic EphemerisBasedIslamic?long=140.5200E&lat=38.1560N).each do |frame|
-          date = When.when?('1435-1-1', :frame=>frame)
-          36.times do
-            assert_equal(sample.shift, [date.to_s, date.to_i])
-            date += When::P1M
-          end
-        end
-      end
-    end
-  end
-
-end
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2011-2017 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module MiniTest
+
+  module CalendarTypes
+    class Islamic < MiniTest::TestCase
+
+      Sample = [
+        ["1435-01-01", 2456602],["1435-02-01", 2456632],["1435-03-01", 2456661],["1435-04-01", 2456691],
+        ["1435-05-01", 2456720],["1435-06-01", 2456750],["1435-07-01", 2456779],["1435-08-01", 2456809],
+        ["1435-09-01", 2456838],["1435-10-01", 2456868],["1435-11-01", 2456897],["1435-12-01", 2456927],
+
+        ["1436-01-01", 2456956],["1436-02-01", 2456986],["1436-03-01", 2457015],["1436-04-01", 2457045],
+        ["1436-05-01", 2457074],["1436-06-01", 2457104],["1436-07-01", 2457133],["1436-08-01", 2457163],
+        ["1436-09-01", 2457192],["1436-10-01", 2457222],["1436-11-01", 2457251],["1436-12-01", 2457281],
+
+        ["1437-01-01", 2457311],["1437-02-01", 2457341],["1437-03-01", 2457370],["1437-04-01", 2457400],
+        ["1437-05-01", 2457429],["1437-06-01", 2457459],["1437-07-01", 2457488],["1437-08-01", 2457518],
+        ["1437-09-01", 2457547],["1437-10-01", 2457577],["1437-11-01", 2457606],["1437-12-01", 2457636],
+
+
+        ["1435-01-01", 2456602],["1435-02-01", 2456631],["1435-03-01", 2456660],["1435-04-01", 2456690],
+        ["1435-05-01", 2456719],["1435-06-01", 2456749],["1435-07-01", 2456778],["1435-08-01", 2456808],
+        ["1435-09-01", 2456838],["1435-10-01", 2456868],["1435-11-01", 2456898],["1435-12-01", 2456927],
+
+        ["1436-01-01", 2456956],["1436-02-01", 2456986],["1436-03-01", 2457015],["1436-04-01", 2457044],
+        ["1436-05-01", 2457074],["1436-06-01", 2457103],["1436-07-01", 2457133],["1436-08-01", 2457162],
+        ["1436-09-01", 2457192],["1436-10-01", 2457222],["1436-11-01", 2457251],["1436-12-01", 2457281],
+
+        ["1437-01-01", 2457310],["1437-02-01", 2457340],["1437-03-01", 2457370],["1437-04-01", 2457399],
+        ["1437-05-01", 2457429],["1437-06-01", 2457458],["1437-07-01", 2457487],["1437-08-01", 2457517],
+        ["1437-09-01", 2457546],["1437-10-01", 2457576],["1437-11-01", 2457605],["1437-12-01", 2457635],
+      ]
+
+      def test_islamic_date
+        sample = Sample.dup
+        %w(TabularIslamic EphemerisBasedIslamic?long=140.5200E&lat=38.1560N).each do |frame|
+          date = When.when?('1435-1-1', :frame=>frame)
+          36.times do
+            assert_equal(sample.shift, [date.to_s, date.to_i])
+            date += When::P1M
+          end
+        end
+      end
+
+      def test_ummalqura_solar
+        date = When.when? '2017.9.23'
+        assert_equal('1396-01-01', (When::UmmalquraSolar ^ date).to_s)
+        399.times do
+          date += When::P1Y
+          assert_equal([1,1], (When::UmmalquraSolar ^ date).cal_date[-2..-1])
+        end
+      end
+
+    end
+  end
+
+end

data/test/test/region/japanese.rb

@@ -1,261 +1,281 @@
-# -*- coding: utf-8 -*-
-=begin
-  Copyright (C) 2011-2014 Takashi SUGA
-
-  You may use and/or modify this file according to the license
-  described in the LICENSE.txt file included in this archive.
-=end
-
-module MiniTest
-
-  class Japanese < MiniTest::TestCase
-
-    include When::CalendarNote::Japanese::Index
-    Masks = MD廿四節気|MD七十二候|MD六十卦|MD没|MD往亡
-
-    def test_japanese_epoch
-      eras = When.Resource('_e:Japanese')
-
-      sample = 
-        [["天平21(0749).04.13", "天平感宝01(0749).04.13", "天平勝宝01(0749).04.13"],
-         ["天平21(0749).04.13"],
-         ["天平感宝01(0749).04.14", "天平勝宝01(0749).04.14"],
-         ["天平感宝01(0749).04.14"],
-         ["天平勝宝01(0749).07.02"],
-         ["天平勝宝01(0749).07.02"]]
-         ['天平勝宝01.04.13', '天平勝宝01.04.14', '天平勝宝01.07.02'].each do |string|
-        assert_equal(sample.shift, ((When.when?(string) ^ eras).
-                                     delete_if {|d| !d.leaf?}).map {|d| d.to_s})
-        assert_equal(sample.shift, ((When.when?(string, {:lower=>true}) ^ eras).
-                                     delete_if {|d| !d.leaf?}).map {|d| d.to_s})
-      end
-
-      sample =
-        [["大正15(1926).12.24"],
-         ["大正15(1926).12.24"],
-         ["昭和01(1926).12.25"],
-         ["昭和01(1926).12.25"],
-         ["昭和01(1926).12.26"],
-         ["昭和01(1926).12.26"]]
-      ['大正15.12.24', '大正15.12.25', '大正15.12.26'].each do |string|
-        assert_equal(sample.shift, ((When.when?(string) ^ eras).
-                                     delete_if {|d| !d.leaf?}).map {|d| d.to_s})
-        assert_equal(sample.shift, ((When.when?(string, {:lower=>true}) ^ eras).
-                                     delete_if {|d| !d.leaf?}).map {|d| d.to_s})
-      end
-    end
-
-    def test__solar_terms
-      sample = [
-        [ # 修正後
-          ["貞観12(0870).07.17T+00", []],
-          ["貞観12(0870).07.18T+00", ["処暑(150)", "鷹乃祭鳥", "公損", "没"]],
-          ["貞観12(0870).07.19T+00", []],
-
-          ["天喜05(1057).03.10T+00", []],
-          ["天喜05(1057).03.11T+00", ["穀雨(30)", "萍始生", "公革", "没"]],
-          ["天喜05(1057).03.12T+00", []],
-
-          ["建仁02(1202).10=29T+00", ["没"]],
-          ["建仁02(1202).11.01T+00", ["冬至(270)", "蚯蚓結", "公中孚"]],
-          ["建仁02(1202).11.02T+00", []],
-          ["建仁02(1202).11.03T+00", []],
-
-          ["寛元01(1243).11.03T+00", []],
-          ["寛元01(1243).11.04T+00", ["冬至(270)", "蚯蚓結", "公中孚", "没"]],
-          ["寛元01(1243).11.05T+00", []],
-
-          ["弘安04(1281).07=30T+00", ["没"]],
-          ["弘安04(1281).08.01T+00", ["秋分(180)", "雷乃收聲", "公賁"]],
-          ["弘安04(1281).08.02T+00", []],
-
-          ["永享02(1430).07.11T+00", ["没"]],
-          ["永享02(1430).07.12T+00", []],
-          ["永享02(1430).07.13T+00", []],
-          ["永享02(1430).07.14T+00", ["大夫節"]],
-          ["永享02(1430).07.15T+00", []],
-          ["永享02(1430).07.16T+00", ["白露降"]],
-          ["永享02(1430).07.17T+00", []],
-          ["永享02(1430).07.18T+00", []],
-          ["永享02(1430).07.19T+00", ["往亡"]],
-          ["永享02(1430).07.20T+00", ["卿同人"]],
-          ["永享02(1430).07.21T+00", ["寒蟬鳴"]],
-          ["永享02(1430).07.22T+00", []],
-          ["永享02(1430).07.23T+00", []],
-          ["永享02(1430).07.24T+00", []],
-          ["永享02(1430).07.25T+00", []],
-
-          ["元和03(1617).03.18T+00", []],
-          ["元和03(1617).03.19T+00", ["穀雨(30)", "萍始生", "公革", "没"]],
-          ["元和03(1617).03.20T+00", []],
-
-          ["平成06(1994).06.21T+09:00", ["夏至(90)", "乃東枯"]],
-          ["平成06(1994).06.22T+09:00", []]
-        ],
-
-        [ # 修正前
-          ["貞観12(0870).07.17T+00", ["没"]],
-          ["貞観12(0870).07.18T+00", ["処暑(150)", "鷹乃祭鳥", "公損"]],
-          ["貞観12(0870).07.19T+00", []],
-
-          ["天喜05(1057).03.10T+00", ["没"]],
-          ["天喜05(1057).03.11T+00", ["穀雨(30)", "萍始生", "公革"]],
-          ["天喜05(1057).03.12T+00", []],
-
-          ["建仁02(1202).10=29T+00", ["冬至(270)", "蚯蚓結", "公中孚"]],
-          ["建仁02(1202).11.01T+00", []],
-          ["建仁02(1202).11.02T+00", []],
-          ["建仁02(1202).11.03T+00", ["没"]],
-
-          ["寛元01(1243).11.03T+00", ["没"]],
-          ["寛元01(1243).11.04T+00", ["冬至(270)", "蚯蚓結", "公中孚"]],
-          ["寛元01(1243).11.05T+00", []],
-
-          ["弘安04(1281).07=30T+00", ["秋分(180)", "雷乃收聲", "公賁"]],
-          ["弘安04(1281).08.01T+00", []],
-          ["弘安04(1281).08.02T+00", ["没"]],
-
-          ["永享02(1430).07.11T+00", []],
-          ["永享02(1430).07.12T+00", []],
-          ["永享02(1430).07.13T+00", ["大夫節"]],
-          ["永享02(1430).07.14T+00", []],
-          ["永享02(1430).07.15T+00", ["白露降"]],
-          ["永享02(1430).07.16T+00", []],
-          ["永享02(1430).07.17T+00", []],
-          ["永享02(1430).07.18T+00", ["往亡"]],
-          ["永享02(1430).07.19T+00", ["卿同人"]],
-          ["永享02(1430).07.20T+00", ["寒蟬鳴"]],
-          ["永享02(1430).07.21T+00", []],
-          ["永享02(1430).07.22T+00", []],
-          ["永享02(1430).07.23T+00", []],
-          ["永享02(1430).07.24T+00", []],
-          ["永享02(1430).07.25T+00", ["没"]],
-
-          ["元和03(1617).03.18T+00", ["没"]],
-          ["元和03(1617).03.19T+00", ["穀雨(30)", "萍始生", "公革"]],
-          ["元和03(1617).03.20T+00", []],
-
-          ["平成06(1994).06.21T+09:00", ["夏至(90)", "乃東枯"]],
-          ["平成06(1994).06.22T+09:00", []]
-        ]
-      ]
-
-      2.times do
-        result = []
-        [2039054..2039056,
-         2107233..2107235,
-         2160437..2160440,
-         2175412..2175414,
-         2189200..2189202,
-         2243577..2243591,
-         2311770..2311772,
-         2449525..2449526].each do |range|
-          range.each do |jdn|
-            (When.when?(jdn) ^ When.CalendarEra('Japanese')).each do |date|
-              dates = When.CalendarNote('Japanese').send(:_to_date_for_note, date)
-              date  = When.when?(dates.o_date.to_cal_date.to_s,
-                               {:clock=>dates.s_date.frame.time_basis})
-              long  = dates.cal4note.s_terms.position(date)
-              notes = date.notes(:indices => When::DAY,
-                                 :notes   => Masks,
-                                 :locale  => 'ja').simplify[:value].compact
-              result << [date.to_m17n/'ja', notes]
-            end
-          end
-        end
-        assert_equal(sample.shift, result)
-        When::CalendarNote::Japanese::SolarTerms.send(:patch=, {})
-      end
-      When::CalendarNote::Japanese::SolarTerms.send(:patch=, nil)
-
-      assert_equal('白露(135.375/560)',
-        When.when?('康和1.8.14').notes(:notes=>'廿四節気', :shoyo=>true)[:value].simplify.to_s)
-
-    end
-
-    def test__lunar_phases
-      [%w(康和3.01.09 康和3.01.16 康和3.01.23),
-       %w(康和3.02.08 康和3.02.16 康和3.02.23),
-       %w(康和3.03.08 康和3.03.15 康和3.03.22),
-       %w(康和3.04.09 康和3.04.16 康和3.04.23),
-       %w(康和3.05.08 康和3.05.15 康和3.05.22),
-       %w(康和3.06.08 康和3.06.15 康和3.06.23),
-       %w(康和3.07.08 康和3.07.15 康和3.07.22),
-       %w(康和3.08.07 康和3.08.14 康和3.08.22),
-       %w(康和3.09.07 康和3.09.15 康和3.09.23),
-       %w(康和3.10.08 康和3.10.15 康和3.10.23),
-       %w(康和3.11.07 康和3.11.15 康和3.11.23),
-       %w(康和3.12.08 康和3.12.16 康和3.12.23),
-
-       %w(平成26.01.01 平成26.01.08 平成26.01.16 平成26.01.24),
-       %w(平成26.01.31 平成26.02.07 平成26.02.15 平成26.02.23),
-       %w(平成26.03.01 平成26.03.08 平成26.03.17 平成26.03.24),
-       %w(平成26.03.31 平成26.04.07 平成26.04.15 平成26.04.22),
-       %w(平成26.04.29 平成26.05.07 平成26.05.15 平成26.05.21),
-       %w(平成26.05.29 平成26.06.06 平成26.06.13 平成26.06.20),
-       %w(平成26.06.27 平成26.07.05 平成26.07.12 平成26.07.19),
-       %w(平成26.07.27 平成26.08.04 平成26.08.11 平成26.08.17),
-       %w(平成26.08.25 平成26.09.02 平成26.09.09 平成26.09.16),
-       %w(平成26.09.24 平成26.10.02 平成26.10.08 平成26.10.16),
-       %w(平成26.10.24 平成26.10.31 平成26.11.07 平成26.11.15),
-       %w(平成26.11.22 平成26.11.29 平成26.12.06 平成26.12.14),
-       %w(平成26.12.22 平成26.12.29)
-      ].each do |month|
-        assert_equal([true], month.map {|date| When.when?(date).is?('月相')}.uniq)
-      end
-    end
-
-    def test__eclipse
-      date = When.when?('貞観4.2.1')
-      assert_equal('夜日蝕七分', date.notes({:notes=>'日食'}).value)
-      assert_equal(nil, date.notes({:notes=>'日食', :solar_eclipse=>1}).value)
-
-      date = When.when?('貞観4.2.15')
-      assert_equal('(月蝕ニ分)', date.notes({:notes=>'月食'}).value)
-      assert_equal(nil, date.notes({:notes=>'月食', :lunar_eclipse=>3}).value)
-    end
-
-    def test_japanese_lunisolar
-      assert_equal({1850=>{"hI"=>"Hi"}, 1866=>{"cD"=>"Cd"}, 1884=>{"cD"=>"Cd"}, 1947=>{"b"=>"c"}},
-                    When.Calendar('Japanese').verify(When.Calendar('JapaneseTwin::旧暦'), 1844..2033))
-    end
-
-    def test_japanese_era
-      assert_raises(RangeError) {When.TemporalPosition("正慶", 2, 11)}
-      assert_equal("延元02(1337).01.08",          When.when?("建武4.1.8").to_s)
-      assert_equal("延元02(1337).01.08",          When.TemporalPosition("建武", 4, 1, 8, {:invalid=>:non}).to_s)
-      assert_equal("<神武>03(-657).01.30",        When.when?('神武3.1.30').to_s)    # , {'period'=>/清/})
-      assert_equal("日本::皇紀2600(1940).01.30",  When.when?('皇紀2600.1.30').to_s) # , {'period'=>/清/})
-      assert_equal("応永11(1404).12.10",          When.when?('嘉慶18.12.10').to_s)
-      assert_equal("明治01(1868).09.08",          When.when?('明治1(1868).09.08').to_s)
-      assert_equal("天保03(0564).10.01",          When.when?('天保3.10.01', {'period'=>/梁/}).to_s)
-      assert_equal(%w(元暦 文治 建久 正治 建仁 元久 建永 承元 建暦 建保
-                      承久 貞応 元仁 嘉禄 安貞 寛喜 貞永 天福 文暦 嘉禎
-                      暦仁 延応 仁治 寛元 宝治 建長 康元 正嘉 正元 文応
-                      弘長 文永 建治 弘安 正応 永仁 正安 乾元 嘉元 徳治
-                      延慶 応長 正和 文保 元応 元亨 正中 嘉暦 元徳 元弘),
-                   When.era('鎌倉時代')[0].map { |era| era.label.to_s})
-
-      date = When.when?('768-10-20^^Gregorian')
-      assert_equal('神護景雲02(0768).09.02',                        (date ^ When.CalendarEra('Japanese'))[0].to_s)
-      assert_equal('日本?V=0764::奈良時代::神護景雲02(0768).09.01', (date ^ When.CalendarEra('Japanese?V=0764'))[0].to_s)
-      assert_equal('日本::奈良時代::神護景雲02(0768).09.02',        (date ^ When.CalendarEra('Japanese'))[0].to_s)
-    end
-=begin
-    def test_japanese_date
-      jc   = When.Resource('_c:Japanese')
-      diff = []
-      open('test/region/japanese-calendar.txt', "1".respond_to?(:force_encoding) ? 'r:utf-8' : 'r') do |f|
-        while (line = f.gets)
-          next if line =~ /\A *#/
-          x, x, jdn, x, x, x, gy, gm, gd, x, x, jy, jm, jd = line.split(/ +/).map {|v| v.to_i}
-          jm, leap = (jm > 0) ? [jm, '-'] : [-jm, '=']
-          date = When.when?("%04d-%02d%s%02d" % [(gm >= jm) ? gy : gy-1, jm, leap, jd], {:frame=>jc})
-          diff << [jdn - date.to_i, date.to_s] unless jdn == date.to_i
-        end
-      end
-      assert_equal([], diff)
-    end
-=end
-  end
-end
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2011-2020 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module MiniTest
+
+  class Japanese < MiniTest::TestCase
+
+    include When::CalendarNote::Japanese::Index
+    Masks = MD廿四節気|MD七十二候|MD六十卦|MD没|MD往亡
+
+    def test_japanese_epoch
+      eras = When.Resource('_e:Japanese')
+
+      sample = 
+        [["天平21(0749).04.13", "天平感宝01(0749).04.13", "天平勝宝01(0749).04.13"],
+         ["天平21(0749).04.13"],
+         ["天平感宝01(0749).04.14", "天平勝宝01(0749).04.14"],
+         ["天平感宝01(0749).04.14"],
+         ["天平勝宝01(0749).07.02"],
+         ["天平勝宝01(0749).07.02"]]
+         ['天平勝宝01.04.13', '天平勝宝01.04.14', '天平勝宝01.07.02'].each do |string|
+        assert_equal(sample.shift, ((When.when?(string) ^ eras).
+                                     delete_if {|d| !d.leaf?}).map {|d| d.to_s})
+        assert_equal(sample.shift, ((When.when?(string, {:lower=>true}) ^ eras).
+                                     delete_if {|d| !d.leaf?}).map {|d| d.to_s})
+      end
+
+      sample =
+        [["大正15(1926).12.24"],
+         ["大正15(1926).12.24"],
+         ["昭和01(1926).12.25"],
+         ["昭和01(1926).12.25"],
+         ["昭和01(1926).12.26"],
+         ["昭和01(1926).12.26"]]
+      ['大正15.12.24', '大正15.12.25', '大正15.12.26'].each do |string|
+        assert_equal(sample.shift, ((When.when?(string) ^ eras).
+                                     delete_if {|d| !d.leaf?}).map {|d| d.to_s})
+        assert_equal(sample.shift, ((When.when?(string, {:lower=>true}) ^ eras).
+                                     delete_if {|d| !d.leaf?}).map {|d| d.to_s})
+      end
+    end
+
+    def test__solar_terms
+      sample = [
+        [ # 修正後
+          ["貞観12(0870).07.17T+00", []],
+          ["貞観12(0870).07.18T+00", ["処暑(150)", "鷹乃祭鳥", "公損", "没"]],
+          ["貞観12(0870).07.19T+00", []],
+
+          ["天喜05(1057).03.10T+00", []],
+          ["天喜05(1057).03.11T+00", ["穀雨(30)", "萍始生", "公革", "没"]],
+          ["天喜05(1057).03.12T+00", []],
+
+          ["建仁02(1202).10=29T+00", ["没"]],
+          ["建仁02(1202).11.01T+00", ["冬至(270)", "蚯蚓結", "公中孚"]],
+          ["建仁02(1202).11.02T+00", []],
+          ["建仁02(1202).11.03T+00", []],
+
+          ["寛元01(1243).11.03T+00", []],
+          ["寛元01(1243).11.04T+00", ["冬至(270)", "蚯蚓結", "公中孚", "没"]],
+          ["寛元01(1243).11.05T+00", []],
+
+          ["弘安04(1281).07=30T+00", ["没"]],
+          ["弘安04(1281).08.01T+00", ["秋分(180)", "雷乃收聲", "公賁"]],
+          ["弘安04(1281).08.02T+00", []],
+
+          ["永享02(1430).07.11T+00", ["没"]],
+          ["永享02(1430).07.12T+00", []],
+          ["永享02(1430).07.13T+00", []],
+          ["永享02(1430).07.14T+00", ["大夫節"]],
+          ["永享02(1430).07.15T+00", []],
+          ["永享02(1430).07.16T+00", ["白露降"]],
+          ["永享02(1430).07.17T+00", []],
+          ["永享02(1430).07.18T+00", []],
+          ["永享02(1430).07.19T+00", ["往亡"]],
+          ["永享02(1430).07.20T+00", ["卿同人"]],
+          ["永享02(1430).07.21T+00", ["寒蟬鳴"]],
+          ["永享02(1430).07.22T+00", []],
+          ["永享02(1430).07.23T+00", []],
+          ["永享02(1430).07.24T+00", []],
+          ["永享02(1430).07.25T+00", []],
+
+          ["元和03(1617).03.18T+00", []],
+          ["元和03(1617).03.19T+00", ["穀雨(30)", "萍始生", "公革", "没"]],
+          ["元和03(1617).03.20T+00", []],
+
+          ["平成06(1994).06.21T+09:00", ["夏至(90)", "乃東枯"]],
+          ["平成06(1994).06.22T+09:00", []]
+        ],
+
+        [ # 修正前
+          ["貞観12(0870).07.17T+00", ["没"]],
+          ["貞観12(0870).07.18T+00", ["処暑(150)", "鷹乃祭鳥", "公損"]],
+          ["貞観12(0870).07.19T+00", []],
+
+          ["天喜05(1057).03.10T+00", ["没"]],
+          ["天喜05(1057).03.11T+00", ["穀雨(30)", "萍始生", "公革"]],
+          ["天喜05(1057).03.12T+00", []],
+
+          ["建仁02(1202).10=29T+00", ["冬至(270)", "蚯蚓結", "公中孚"]],
+          ["建仁02(1202).11.01T+00", []],
+          ["建仁02(1202).11.02T+00", []],
+          ["建仁02(1202).11.03T+00", ["没"]],
+
+          ["寛元01(1243).11.03T+00", ["没"]],
+          ["寛元01(1243).11.04T+00", ["冬至(270)", "蚯蚓結", "公中孚"]],
+          ["寛元01(1243).11.05T+00", []],
+
+          ["弘安04(1281).07=30T+00", ["秋分(180)", "雷乃收聲", "公賁"]],
+          ["弘安04(1281).08.01T+00", []],
+          ["弘安04(1281).08.02T+00", ["没"]],
+
+          ["永享02(1430).07.11T+00", []],
+          ["永享02(1430).07.12T+00", []],
+          ["永享02(1430).07.13T+00", ["大夫節"]],
+          ["永享02(1430).07.14T+00", []],
+          ["永享02(1430).07.15T+00", ["白露降"]],
+          ["永享02(1430).07.16T+00", []],
+          ["永享02(1430).07.17T+00", []],
+          ["永享02(1430).07.18T+00", ["往亡"]],
+          ["永享02(1430).07.19T+00", ["卿同人"]],
+          ["永享02(1430).07.20T+00", ["寒蟬鳴"]],
+          ["永享02(1430).07.21T+00", []],
+          ["永享02(1430).07.22T+00", []],
+          ["永享02(1430).07.23T+00", []],
+          ["永享02(1430).07.24T+00", []],
+          ["永享02(1430).07.25T+00", ["没"]],
+
+          ["元和03(1617).03.18T+00", ["没"]],
+          ["元和03(1617).03.19T+00", ["穀雨(30)", "萍始生", "公革"]],
+          ["元和03(1617).03.20T+00", []],
+
+          ["平成06(1994).06.21T+09:00", ["夏至(90)", "乃東枯"]],
+          ["平成06(1994).06.22T+09:00", []]
+        ]
+      ]
+
+      2.times do
+        result = []
+        [2039054..2039056,
+         2107233..2107235,
+         2160437..2160440,
+         2175412..2175414,
+         2189200..2189202,
+         2243577..2243591,
+         2311770..2311772,
+         2449525..2449526].each do |range|
+          range.each do |jdn|
+            (When.when?(jdn) ^ When.CalendarEra('Japanese')).each do |date|
+              dates = When.CalendarNote('Japanese').send(:_to_date_for_note, date)
+              date  = When.when?(dates.o_date.to_cal_date.to_s,
+                               {:clock=>dates.s_date.frame.time_basis})
+              long  = dates.cal4note.s_terms.position(date)
+              notes = date.notes(:indices => When::DAY,
+                                 :notes   => Masks,
+                                 :locale  => 'ja').simplify[:value].compact
+              result << [date.to_m17n/'ja', notes]
+            end
+          end
+        end
+        assert_equal(sample.shift, result)
+        When::CalendarNote::Japanese::SolarTerms.send(:patch=, {})
+      end
+      When::CalendarNote::Japanese::SolarTerms.send(:patch=, nil)
+
+      assert_equal('白露(135.375/560)',
+        When.when?('康和1.8.14').notes(:notes=>'廿四節気', :shoyo=>true)[:value].simplify.to_s)
+
+    end
+
+    def test__lunar_phases
+      [%w(康和3.01.09 康和3.01.16 康和3.01.23),
+       %w(康和3.02.08 康和3.02.16 康和3.02.23),
+       %w(康和3.03.08 康和3.03.15 康和3.03.22),
+       %w(康和3.04.09 康和3.04.16 康和3.04.23),
+       %w(康和3.05.08 康和3.05.15 康和3.05.22),
+       %w(康和3.06.08 康和3.06.15 康和3.06.23),
+       %w(康和3.07.08 康和3.07.15 康和3.07.22),
+       %w(康和3.08.07 康和3.08.14 康和3.08.22),
+       %w(康和3.09.07 康和3.09.15 康和3.09.23),
+       %w(康和3.10.08 康和3.10.15 康和3.10.23),
+       %w(康和3.11.07 康和3.11.15 康和3.11.23),
+       %w(康和3.12.08 康和3.12.16 康和3.12.23),
+
+       %w(平成26.01.01 平成26.01.08 平成26.01.16 平成26.01.24),
+       %w(平成26.01.31 平成26.02.07 平成26.02.15 平成26.02.23),
+       %w(平成26.03.01 平成26.03.08 平成26.03.17 平成26.03.24),
+       %w(平成26.03.31 平成26.04.07 平成26.04.15 平成26.04.22),
+       %w(平成26.04.29 平成26.05.07 平成26.05.15 平成26.05.21),
+       %w(平成26.05.29 平成26.06.06 平成26.06.13 平成26.06.20),
+       %w(平成26.06.27 平成26.07.05 平成26.07.12 平成26.07.19),
+       %w(平成26.07.27 平成26.08.04 平成26.08.11 平成26.08.17),
+       %w(平成26.08.25 平成26.09.02 平成26.09.09 平成26.09.16),
+       %w(平成26.09.24 平成26.10.02 平成26.10.08 平成26.10.16),
+       %w(平成26.10.24 平成26.10.31 平成26.11.07 平成26.11.15),
+       %w(平成26.11.22 平成26.11.29 平成26.12.06 平成26.12.14),
+       %w(平成26.12.22 平成26.12.29)
+      ].each do |month|
+        assert_equal([true], month.map {|date| When.when?(date).is?('月相')}.uniq)
+      end
+    end
+
+    def test__eclipse
+      date = When.when?('貞観4.2.1')
+      assert_equal('夜日蝕七分', date.notes({:notes=>'日食'}).value)
+      assert_nil(date.notes({:notes=>'日食', :solar_eclipse=>1}).value)
+
+      date = When.when?('貞観4.2.15')
+      assert_equal('(月蝕ニ分)', date.notes({:notes=>'月食'}).value)
+      assert_nil(date.notes({:notes=>'月食', :lunar_eclipse=>3}).value)
+    end
+
+    def test_japanese_lunisolar
+      assert_equal({1850=>{"hI"=>"Hi"}, 1866=>{"cD"=>"Cd"}, 1884=>{"cD"=>"Cd"}, 1947=>{"b"=>"c"}},
+                    When.Calendar('Japanese').verify(When.Calendar('JapaneseTwin::旧暦'), 1844..2033))
+    end
+
+    def test_japanese_era
+      assert_raises(RangeError) {When.TemporalPosition("正慶", 2, 11)}
+      assert_equal("延元02(1337).01.08",          When.when?("建武4.1.8").to_s)
+      assert_equal("延元02(1337).01.08",          When.TemporalPosition("建武", 4, 1, 8, {:invalid=>:non}).to_s)
+      assert_equal("<神武>03(-657).01.30",        When.when?('神武3.1.30').to_s)    # , {'period'=>/清/})
+      assert_equal("日本::皇紀2600(1940).01.30",  When.when?('皇紀2600.1.30').to_s) # , {'period'=>/清/})
+      assert_equal("応永11(1404).12.10",          When.when?('嘉慶18.12.10').to_s)
+      assert_equal("明治01(1868).09.08",          When.when?('明治1(1868).09.08').to_s)
+      assert_equal("天保03(0564).10.01",          When.when?('天保3.10.01', {'period'=>/梁/}).to_s)
+      assert_equal(%w(元暦 文治 建久 正治 建仁 元久 建永 承元 建暦 建保
+                      承久 貞応 元仁 嘉禄 安貞 寛喜 貞永 天福 文暦 嘉禎
+                      暦仁 延応 仁治 寛元 宝治 建長 康元 正嘉 正元 文応
+                      弘長 文永 建治 弘安 正応 永仁 正安 乾元 嘉元 徳治
+                      延慶 応長 正和 文保 元応 元亨 正中 嘉暦 元徳 元弘),
+                   When.era('鎌倉時代')[0].map { |era| era.label.to_s})
+
+      date = When.when?('768-10-20^^Gregorian')
+      assert_equal('神護景雲02(0768).09.02',                        (date ^ When.CalendarEra('Japanese'))[0].to_s)
+      assert_equal('日本?V=0764::奈良時代::神護景雲02(0768).09.01', (date ^ When.CalendarEra('Japanese?V=0764'))[0].to_s)
+      assert_equal('日本::奈良時代::神護景雲02(0768).09.02',        (date ^ When.CalendarEra('Japanese'))[0].to_s)
+    end
+
+    def test__japanese_parser
+      assert_equal('1945-08-15', When.when?('1945 Aug 15', :parse=>'%Y %B %d').to_s)
+      assert_equal('2022-01-06T09:18:24+09:00', When.when?('Thu Jan 6  9:18:24 JST', {:abbr=>2015, :parse=>'%A %B %d %H:%M:%S %z'}).to_s)
+      assert_equal('2022-01-06T09:18:24+09:00', When.when?('木 1月 6  9:18:24 JST', {:abbr=>2015, :parse=>['%A %B %d %H:%M:%S %z', 'ja']}).to_s)
+      assert_equal('昭和15(1940).11.20', When.when?('昭和十五年十一月廿日', {:parse=>When::Locale::JapaneseParser}).to_s)
+      assert_equal('昭和59(1984).11.26', When.when?('昭和甲子年11月甲子', {:parse=>When::Locale::JapaneseParser}).to_s)
+      assert_equal('昭和59(1984).11.26', When.when?('昭和甲子歳11月甲子', {:parse=>When::Locale::JapaneseParser}).to_s)
+      assert_equal('明治01(1868).04=07T12:06:03+09:00', When.when?('明治元年閏4月甲寅12時6分3秒+09:00',
+                                                       {:parse=>When::Locale::JapaneseParser}).to_s)
+    end
+
+    def test__japanese_digits
+      When::Locale::NumRExp3
+      assert_equal([512100060, 1200000000, 230000000, 34000000, 4500000, 560000, 67000, 7800, 890, 90, 0],
+      %w(伍億仟弐佰拾萬陸拾 十二億 二億三千万 三千四百万 四百五十万 五十六万 六万七千 七千八百 八百九十 九十零 零).map {|fig|
+        When::Locale.k2a_digits(fig, true)
+      })
+    end
+
+=begin
+    def test_japanese_date
+      jc   = When.Resource('_c:Japanese')
+      diff = []
+      open('test/region/japanese-calendar.txt', "1".respond_to?(:force_encoding) ? 'r:utf-8' : 'r') do |f|
+        while (line = f.gets)
+          next if line =~ /\A *#/
+          x, x, jdn, x, x, x, gy, gm, gd, x, x, jy, jm, jd = line.split(/ +/).map {|v| v.to_i}
+          jm, leap = (jm > 0) ? [jm, '-'] : [-jm, '=']
+          date = When.when?("%04d-%02d%s%02d" % [(gm >= jm) ? gy : gy-1, jm, leap, jd], {:frame=>jc})
+          diff << [jdn - date.to_i, date.to_s] unless jdn == date.to_i
+        end
+      end
+      assert_equal([], diff)
+    end
+=end
+  end
+end