holidays 5.7.0 → 6.0.0

data/test/defs/test_defs_jp.rb

@@ -7,72 +7,125 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class JpDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_jp
-{Date.civil(2008,1,1) => '元日',
- Date.civil(2010,1,11) => '成人の日',
- Date.civil(2008,2,11) => '建国記念の日',
- Date.civil(2008,4,29) => '昭和の日',
- Date.civil(2008,5,3) => '憲法記念日',
- Date.civil(2008,5,5) => 'こどもの日',
- Date.civil(2010,7,19) => '海の日',
- Date.civil(2010,9,20) => '敬老の日',
- Date.civil(2010,10,11) => '体育の日',
- Date.civil(2008,11,3) => '文化の日',
- Date.civil(2008,11,23) => '勤労感謝の日',
- Date.civil(2008,12,23) => '天皇誕生日',
- Date.civil(2010,3,22) => '振替休日',
- Date.civil(2008,11,24) => '振替休日',
- Date.civil(2012,1,2) => '振替休日',
- Date.civil(2013,5,6) => '振替休日',
- Date.civil(2014,5,6) => '振替休日',
- Date.civil(2015,5,6) => '振替休日',
- Date.civil(2019,8,12) => '振替休日'
-}.each do |date, name|
-   assert_equal name, (Holidays.on(date, :jp, :informal)[0] || {})[:name]
-end
+    assert_equal "元日", (Holidays.on(Date.civil(2008, 1, 1), [:jp], [:informal])[0] || {})[:name]
 
-# vernal equinox day
-[Date.civil(2004,3,20), Date.civil(2005,3,20), Date.civil(2006,3,21),
- Date.civil(2007,3,21), Date.civil(2008,3,20), Date.civil(2009,3,20),
- Date.civil(2010,3,21)].each do |date|
-  assert_equal '春分の日', Holidays.on(date, :jp)[0][:name]
-end
+    assert_equal "成人の日", (Holidays.on(Date.civil(2010, 1, 11), [:jp], [:informal])[0] || {})[:name]
 
-# national culture day
-[Date.civil(2004,9,23), Date.civil(2005,9,23), Date.civil(2006,9,23),
- Date.civil(2007,9,23), Date.civil(2008,9,23), Date.civil(2009,9,23),
- Date.civil(2010,9,23), Date.civil(2011,9,23), Date.civil(2012,9,22),
- Date.civil(2013,9,23)].each do |date|
-  assert_equal '秋分の日', Holidays.on(date, :jp)[0][:name]
-end
+    assert_equal "建国記念の日", (Holidays.on(Date.civil(2008, 2, 11), [:jp], [:informal])[0] || {})[:name]
 
-# citizens holiday
-[Date.civil(2032,9,21), Date.civil(2049,9,21), Date.civil(2009,9,22),
- Date.civil(2015,9,22), Date.civil(2026,9,22)].each do |date|
-  assert_equal '国民の休日', Holidays.on(date, :jp)[0][:name]
-end
+    assert_equal "昭和の日", (Holidays.on(Date.civil(2008, 4, 29), [:jp], [:informal])[0] || {})[:name]
 
-# marine day since 1996
-[Date.civil(1996, 7, 20), Date.civil(2002, 7, 20), Date.civil(2003, 7, 21),
- Date.civil(2004, 7, 19), Date.civil(2005, 7, 18), Date.civil(2006, 7, 17),
- Date.civil(2007, 7, 16), Date.civil(2009, 7, 20), Date.civil(2013, 7, 15),
- Date.civil(2014, 7, 21)].each do |date|
-  assert_equal '海の日', Holidays.on(date, :jp)[0][:name]
-end
+    assert_equal "憲法記念日", (Holidays.on(Date.civil(2008, 5, 3), [:jp], [:informal])[0] || {})[:name]
 
-# mountain holiday start since 2016
-[Date.civil(2016,8,11), Date.civil(2017,8,11),Date.civil(2018,8,11),
- Date.civil(2019,8,11), Date.civil(2020,8,11),Date.civil(2021,8,11),
- Date.civil(2022,8,11)].each do |date|
-  assert_equal '山の日', Holidays.on(date, :jp)[0][:name]
-end
+    assert_equal "こどもの日", (Holidays.on(Date.civil(2008, 5, 5), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2010, 7, 19), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "敬老の日", (Holidays.on(Date.civil(2010, 9, 20), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "体育の日", (Holidays.on(Date.civil(2010, 10, 11), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "文化の日", (Holidays.on(Date.civil(2008, 11, 3), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "勤労感謝の日", (Holidays.on(Date.civil(2008, 11, 23), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "天皇誕生日", (Holidays.on(Date.civil(2008, 12, 23), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "振替休日", (Holidays.on(Date.civil(2010, 3, 22), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "振替休日", (Holidays.on(Date.civil(2008, 11, 24), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "振替休日", (Holidays.on(Date.civil(2012, 1, 2), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "振替休日", (Holidays.on(Date.civil(2013, 5, 6), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "振替休日", (Holidays.on(Date.civil(2014, 5, 6), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "振替休日", (Holidays.on(Date.civil(2015, 5, 6), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "振替休日", (Holidays.on(Date.civil(2019, 8, 12), [:jp], [:informal])[0] || {})[:name]
+
+    assert_equal "春分の日", (Holidays.on(Date.civil(2004, 3, 20), [:jp])[0] || {})[:name]
+
+    assert_equal "春分の日", (Holidays.on(Date.civil(2005, 3, 20), [:jp])[0] || {})[:name]
+
+    assert_equal "春分の日", (Holidays.on(Date.civil(2006, 3, 21), [:jp])[0] || {})[:name]
+
+    assert_equal "春分の日", (Holidays.on(Date.civil(2007, 3, 21), [:jp])[0] || {})[:name]
+
+    assert_equal "春分の日", (Holidays.on(Date.civil(2008, 3, 20), [:jp])[0] || {})[:name]
+
+    assert_equal "春分の日", (Holidays.on(Date.civil(2009, 3, 20), [:jp])[0] || {})[:name]
+
+    assert_equal "春分の日", (Holidays.on(Date.civil(2010, 3, 21), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2004, 9, 23), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2005, 9, 23), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2006, 9, 23), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2007, 9, 23), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2008, 9, 23), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2009, 9, 23), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2010, 9, 23), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2011, 9, 23), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2012, 9, 22), [:jp])[0] || {})[:name]
+
+    assert_equal "秋分の日", (Holidays.on(Date.civil(2013, 9, 23), [:jp])[0] || {})[:name]
+
+    assert_equal "国民の休日", (Holidays.on(Date.civil(2032, 9, 21), [:jp])[0] || {})[:name]
+
+    assert_equal "国民の休日", (Holidays.on(Date.civil(2049, 9, 21), [:jp])[0] || {})[:name]
+
+    assert_equal "国民の休日", (Holidays.on(Date.civil(2009, 9, 22), [:jp])[0] || {})[:name]
+
+    assert_equal "国民の休日", (Holidays.on(Date.civil(2015, 9, 22), [:jp])[0] || {})[:name]
+
+    assert_equal "国民の休日", (Holidays.on(Date.civil(2026, 9, 22), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(1996, 7, 20), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2002, 7, 20), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2003, 7, 21), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2004, 7, 19), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2005, 7, 18), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2006, 7, 17), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2007, 7, 16), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2009, 7, 20), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2013, 7, 15), [:jp])[0] || {})[:name]
+
+    assert_equal "海の日", (Holidays.on(Date.civil(2014, 7, 21), [:jp])[0] || {})[:name]
+
+    assert_equal "山の日", (Holidays.on(Date.civil(2016, 8, 11), [:jp])[0] || {})[:name]
+
+    assert_equal "山の日", (Holidays.on(Date.civil(2017, 8, 11), [:jp])[0] || {})[:name]
+
+    assert_equal "山の日", (Holidays.on(Date.civil(2018, 8, 11), [:jp])[0] || {})[:name]
+
+    assert_equal "山の日", (Holidays.on(Date.civil(2019, 8, 11), [:jp])[0] || {})[:name]
+
+    assert_equal "山の日", (Holidays.on(Date.civil(2020, 8, 11), [:jp])[0] || {})[:name]
+
+    assert_equal "山の日", (Holidays.on(Date.civil(2021, 8, 11), [:jp])[0] || {})[:name]
+
+    assert_equal "山の日", (Holidays.on(Date.civil(2022, 8, 11), [:jp])[0] || {})[:name]
 
-# before 2016, there is no mountain holiday.
-assert_nil Holidays.on(Date.civil(2015,8,11), :jp)[0]
+    assert_nil (Holidays.on(Date.civil(2015, 8, 11), [:jp])[0] || {})[:name]
 
-# before 2003, there is no citizens holiday.
-# [note] citizens holiday requires that jp_national_culture_day is wednesday.
-#        Before 2003, the closest past year that mathches above condition is 1998.
-assert_nil Holidays.on(Date.civil(1998,9,22), :jp)[0]
+    assert_nil (Holidays.on(Date.civil(1998, 9, 22), [:jp])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_kr.rb

@@ -7,23 +7,31 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class KrDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_kr
-{Date.civil(2016,2,8) => "설날",
- Date.civil(2017,1,29) => "설날 연휴",
- Date.civil(2016,5,14) => "석가탄신일",
- Date.civil(2016,9,15) => "추석",
- Date.civil(2016,1,1) => "신정",
- Date.civil(2016,3,1) => "3·1절",
- Date.civil(2016,5,5) => "어린이날",
- Date.civil(2016,6,6) => "현충일",
- Date.civil(2016,7,17) => "제헌절",
- Date.civil(2016,8,15) => "광복절",
- Date.civil(2016,10,3) => "개천절",
- Date.civil(2016,10,9) => "한글날",
- Date.civil(2016,12,25) => "크리스마스",
- Date.civil(2017,1,28) => "설날"
-}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :kr, :informal)[0] || {})[:name]
-end
+    assert_equal "설날", (Holidays.on(Date.civil(2016, 2, 8), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "설날 연휴", (Holidays.on(Date.civil(2017, 1, 29), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "석가탄신일", (Holidays.on(Date.civil(2016, 5, 14), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "추석", (Holidays.on(Date.civil(2016, 9, 15), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "3·1절", (Holidays.on(Date.civil(2016, 3, 1), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "어린이날", (Holidays.on(Date.civil(2016, 5, 5), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "현충일", (Holidays.on(Date.civil(2016, 6, 6), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "제헌절", (Holidays.on(Date.civil(2016, 7, 17), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "광복절", (Holidays.on(Date.civil(2016, 8, 15), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "개천절", (Holidays.on(Date.civil(2016, 10, 3), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "한글날", (Holidays.on(Date.civil(2016, 10, 9), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "크리스마스", (Holidays.on(Date.civil(2016, 12, 25), [:kr], [:informal])[0] || {})[:name]
+
+    assert_equal "설날", (Holidays.on(Date.civil(2017, 1, 28), [:kr], [:informal])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_li.rb

@@ -7,29 +7,29 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class LiDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_li
-{Date.civil(2009,1,1) => 'Neujahrstag',
- Date.civil(2011,3,8) => 'Fasnachtsdienstag',
- Date.civil(2009,4,10) => 'Karfreitag',
- Date.civil(2009,4,12) => 'Ostern',
- Date.civil(2009,4,13) => 'Ostermontag',
- Date.civil(2009,5,21) => 'Auffahrt',
- Date.civil(2009,6,1) => 'Pfingstmontag',
- Date.civil(2009,12,25) => 'Weihnachten',
- Date.civil(2009,12,26) => 'Stefanstag'}.each do |date, name|
-  assert_equal name, Holidays.on(date, :li, :informal)[0][:name]
-end
+    assert_equal "Neujahrstag", (Holidays.on(Date.civil(2009, 1, 1), [:li], [:informal])[0] || {})[:name]
 
-[:li].each do |r|
-  assert_equal 'Fronleichnam', Holidays.on(Date.civil(2009,6,11), r)[0][:name]
-end
+    assert_equal "Fasnachtsdienstag", (Holidays.on(Date.civil(2011, 3, 8), [:li], [:informal])[0] || {})[:name]
 
-[:li].each do |r|
-  assert_equal 'Staatsfeiertag', Holidays.on(Date.civil(2009,8,15), r)[0][:name]
-end
+    assert_equal "Karfreitag", (Holidays.on(Date.civil(2009, 4, 10), [:li], [:informal])[0] || {})[:name]
 
-[:li].each do |r|
-  assert_equal 'Allerheiligen', Holidays.on(Date.civil(2009,11,1), r)[0][:name]
-end
+    assert_equal "Ostern", (Holidays.on(Date.civil(2009, 4, 12), [:li], [:informal])[0] || {})[:name]
+
+    assert_equal "Ostermontag", (Holidays.on(Date.civil(2009, 4, 13), [:li], [:informal])[0] || {})[:name]
+
+    assert_equal "Auffahrt", (Holidays.on(Date.civil(2009, 5, 21), [:li], [:informal])[0] || {})[:name]
+
+    assert_equal "Pfingstmontag", (Holidays.on(Date.civil(2009, 6, 1), [:li], [:informal])[0] || {})[:name]
+
+    assert_equal "Weihnachten", (Holidays.on(Date.civil(2009, 12, 25), [:li], [:informal])[0] || {})[:name]
+
+    assert_equal "Stefanstag", (Holidays.on(Date.civil(2009, 12, 26), [:li], [:informal])[0] || {})[:name]
+
+    assert_equal "Fronleichnam", (Holidays.on(Date.civil(2009, 6, 11), [:li])[0] || {})[:name]
+
+    assert_equal "Staatsfeiertag", (Holidays.on(Date.civil(2009, 8, 15), [:li])[0] || {})[:name]
+
+    assert_equal "Allerheiligen", (Holidays.on(Date.civil(2009, 11, 1), [:li])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_lt.rb

@@ -7,36 +7,57 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class LtDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_lt
-{Date.civil(2008,1,1) => 'Naujieji metai',
- Date.civil(2008,2,16) => 'Valstybės atkūrimo diena',
- Date.civil(2008,3,11) => 'Nepriklausomybės atkūrimo diena',
- Date.civil(2008,3,23) => 'Šv. Velykos',
- Date.civil(2008,3,24) => 'Antroji Velykų diena',
- Date.civil(2008,5,1) => 'Darbininkų diena',
- Date.civil(2008,6,24) => 'Joninės',
- Date.civil(2008,7,6) => 'Valstybės diena',
- Date.civil(2008,8,15) => 'Žolinė',
- Date.civil(2008,11,1) => 'Visų šventųjų diena',
- Date.civil(2008,12,24) => 'Šv. Kūčios',
- Date.civil(2008,12,25) => 'Šv. Kalėdos',
- Date.civil(2008,12,26) => 'Antroji Kalėdų diena'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :lt)[0] || {})[:name]
-end
-{Date.civil(2012,1,1) => 'Naujieji metai',
- Date.civil(2012,2,16) => 'Valstybės atkūrimo diena',
- Date.civil(2012,3,11) => 'Nepriklausomybės atkūrimo diena',
- Date.civil(2012,4,8) => 'Šv. Velykos',
- Date.civil(2012,4,9) => 'Antroji Velykų diena',
- Date.civil(2012,5,1) => 'Darbininkų diena',
- Date.civil(2012,6,24) => 'Joninės',
- Date.civil(2012,7,6) => 'Valstybės diena',
- Date.civil(2012,8,15) => 'Žolinė',
- Date.civil(2012,11,1) => 'Visų šventųjų diena',
- Date.civil(2012,12,24) => 'Šv. Kūčios',
- Date.civil(2012,12,25) => 'Šv. Kalėdos',
- Date.civil(2012,12,26) => 'Antroji Kalėdų diena'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :lt)[0] || {})[:name]
-end
+    assert_equal "Naujieji metai", (Holidays.on(Date.civil(2008, 1, 1), [:lt])[0] || {})[:name]
+
+    assert_equal "Valstybės atkūrimo diena", (Holidays.on(Date.civil(2008, 2, 16), [:lt])[0] || {})[:name]
+
+    assert_equal "Nepriklausomybės atkūrimo diena", (Holidays.on(Date.civil(2008, 3, 11), [:lt])[0] || {})[:name]
+
+    assert_equal "Šv. Velykos", (Holidays.on(Date.civil(2008, 3, 23), [:lt])[0] || {})[:name]
+
+    assert_equal "Antroji Velykų diena", (Holidays.on(Date.civil(2008, 3, 24), [:lt])[0] || {})[:name]
+
+    assert_equal "Darbininkų diena", (Holidays.on(Date.civil(2008, 5, 1), [:lt])[0] || {})[:name]
+
+    assert_equal "Joninės", (Holidays.on(Date.civil(2008, 6, 24), [:lt])[0] || {})[:name]
+
+    assert_equal "Valstybės diena", (Holidays.on(Date.civil(2008, 7, 6), [:lt])[0] || {})[:name]
+
+    assert_equal "Žolinė", (Holidays.on(Date.civil(2008, 8, 15), [:lt])[0] || {})[:name]
+
+    assert_equal "Visų šventųjų diena", (Holidays.on(Date.civil(2008, 11, 1), [:lt])[0] || {})[:name]
+
+    assert_equal "Šv. Kūčios", (Holidays.on(Date.civil(2008, 12, 24), [:lt])[0] || {})[:name]
+
+    assert_equal "Šv. Kalėdos", (Holidays.on(Date.civil(2008, 12, 25), [:lt])[0] || {})[:name]
+
+    assert_equal "Antroji Kalėdų diena", (Holidays.on(Date.civil(2008, 12, 26), [:lt])[0] || {})[:name]
+
+    assert_equal "Naujieji metai", (Holidays.on(Date.civil(2012, 1, 1), [:lt])[0] || {})[:name]
+
+    assert_equal "Valstybės atkūrimo diena", (Holidays.on(Date.civil(2012, 2, 16), [:lt])[0] || {})[:name]
+
+    assert_equal "Nepriklausomybės atkūrimo diena", (Holidays.on(Date.civil(2012, 3, 11), [:lt])[0] || {})[:name]
+
+    assert_equal "Šv. Velykos", (Holidays.on(Date.civil(2012, 4, 8), [:lt])[0] || {})[:name]
+
+    assert_equal "Antroji Velykų diena", (Holidays.on(Date.civil(2012, 4, 9), [:lt])[0] || {})[:name]
+
+    assert_equal "Darbininkų diena", (Holidays.on(Date.civil(2012, 5, 1), [:lt])[0] || {})[:name]
+
+    assert_equal "Joninės", (Holidays.on(Date.civil(2012, 6, 24), [:lt])[0] || {})[:name]
+
+    assert_equal "Valstybės diena", (Holidays.on(Date.civil(2012, 7, 6), [:lt])[0] || {})[:name]
+
+    assert_equal "Žolinė", (Holidays.on(Date.civil(2012, 8, 15), [:lt])[0] || {})[:name]
+
+    assert_equal "Visų šventųjų diena", (Holidays.on(Date.civil(2012, 11, 1), [:lt])[0] || {})[:name]
+
+    assert_equal "Šv. Kūčios", (Holidays.on(Date.civil(2012, 12, 24), [:lt])[0] || {})[:name]
+
+    assert_equal "Šv. Kalėdos", (Holidays.on(Date.civil(2012, 12, 25), [:lt])[0] || {})[:name]
+
+    assert_equal "Antroji Kalėdų diena", (Holidays.on(Date.civil(2012, 12, 26), [:lt])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_lu.rb

@@ -7,18 +7,23 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class LuDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_lu
-{Date.civil(2008,1,1) => 'Neijoerschdag',
-Date.civil(2008,3,24) => 'Ouschterméindeg',
-Date.civil(2008,5,1) => 'Christi Himmelfaart', # Ascension, Easter+39
-Date.civil(2008,6,23) => 'Nationalfeierdag',
-Date.civil(2008,8,15) => 'Léiffrawëschdag',
-Date.civil(2008,11,1) => 'Allerhellgen',
-Date.civil(2008,12,25) => 'Chrëschtdag',
-Date.civil(2008,12,26) => 'Stiefesdag',
-Date.civil(2008,5,11) => 'Péngschtméindeg'
-}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :lu, :informal)[0] || {})[:name]
-end
+    assert_equal "Neijoerschdag", (Holidays.on(Date.civil(2008, 1, 1), [:lu], [:informal])[0] || {})[:name]
+
+    assert_equal "Ouschterméindeg", (Holidays.on(Date.civil(2008, 3, 24), [:lu], [:informal])[0] || {})[:name]
+
+    assert_equal "Christi Himmelfaart", (Holidays.on(Date.civil(2008, 5, 1), [:lu], [:informal])[0] || {})[:name]
+
+    assert_equal "Nationalfeierdag", (Holidays.on(Date.civil(2008, 6, 23), [:lu], [:informal])[0] || {})[:name]
+
+    assert_equal "Léiffrawëschdag", (Holidays.on(Date.civil(2008, 8, 15), [:lu], [:informal])[0] || {})[:name]
+
+    assert_equal "Allerhellgen", (Holidays.on(Date.civil(2008, 11, 1), [:lu], [:informal])[0] || {})[:name]
+
+    assert_equal "Chrëschtdag", (Holidays.on(Date.civil(2008, 12, 25), [:lu], [:informal])[0] || {})[:name]
+
+    assert_equal "Stiefesdag", (Holidays.on(Date.civil(2008, 12, 26), [:lu], [:informal])[0] || {})[:name]
+
+    assert_equal "Péngschtméindeg", (Holidays.on(Date.civil(2008, 5, 11), [:lu], [:informal])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_ma.rb

@@ -7,17 +7,23 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class MaDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ma
-{Date.civil(2007,1,1) => 'Ras l\' âm',
- Date.civil(2007,1,11) => 'Takdim watikat al-istiqlal',
- Date.civil(2007,5,1) => 'Eid Ash-Shughl',
- Date.civil(2007,7,30) => 'Eid Al-Ârch',
- Date.civil(2007,8,14) => 'Zikra Oued Ed-Dahab',
- Date.civil(2007,8,20) => 'Thawrat al malik wa shâab',
- Date.civil(2007,8,21) => 'Eid Al Milad',
- Date.civil(2007,11,6) => 'Eid Al Massira Al Khadra',
- Date.civil(2007,11,18) => 'Eid Al Istiqulal'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :ma, :informal)[0] || {})[:name]
-end
+    assert_equal "Ras l' âm", (Holidays.on(Date.civil(2007, 1, 1), [:ma], [:informal])[0] || {})[:name]
+
+    assert_equal "Takdim watikat al-istiqlal", (Holidays.on(Date.civil(2007, 1, 11), [:ma], [:informal])[0] || {})[:name]
+
+    assert_equal "Eid Ash-Shughl", (Holidays.on(Date.civil(2007, 5, 1), [:ma], [:informal])[0] || {})[:name]
+
+    assert_equal "Eid Al-Ârch", (Holidays.on(Date.civil(2007, 7, 30), [:ma], [:informal])[0] || {})[:name]
+
+    assert_equal "Zikra Oued Ed-Dahab", (Holidays.on(Date.civil(2007, 8, 14), [:ma], [:informal])[0] || {})[:name]
+
+    assert_equal "Thawrat al malik wa shâab", (Holidays.on(Date.civil(2007, 8, 20), [:ma], [:informal])[0] || {})[:name]
+
+    assert_equal "Eid Al Milad", (Holidays.on(Date.civil(2007, 8, 21), [:ma], [:informal])[0] || {})[:name]
+
+    assert_equal "Eid Al Massira Al Khadra", (Holidays.on(Date.civil(2007, 11, 6), [:ma], [:informal])[0] || {})[:name]
+
+    assert_equal "Eid Al Istiqulal", (Holidays.on(Date.civil(2007, 11, 18), [:ma], [:informal])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_mt_en.rb

@@ -7,26 +7,35 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class Mt_enDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_mt_en
-{ Date.civil(2017, 1, 1) => "New Year's Day",
-  Date.civil(2017, 2, 10) => "Feast of Saint Paul's Shipwreck in Malta",
-  Date.civil(2017, 3, 19) => 'Feast of Saint Joseph',
-  Date.civil(2017, 3, 31) => 'Freedom Day',
-  Date.civil(2017, 5, 1) => "Worker's Day",
-  Date.civil(2017, 6, 7) => 'Sette Giugno',
-  Date.civil(2017, 6, 29) => 'Feast of Saint Peter & Saint Paul',
-  Date.civil(2017, 8, 15) => 'Feast of the Assumption of Our Lady',
-  Date.civil(2017, 9, 8) => 'Victory Day',
-  Date.civil(2017, 9, 21) => 'Independence Day',
-  Date.civil(2017, 12, 8) => 'Feast of the Immaculate Conception',
-  Date.civil(2017, 12, 13) => 'Republic Day',
-  Date.civil(2017, 12, 25) => 'Christmas Day',
-}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :mt_en)[0] || {})[:name]
-end
+    assert_equal "New Year's Day", (Holidays.on(Date.civil(2017, 1, 1), [:mt_en])[0] || {})[:name]
 
-[Date.civil(2017, 4, 14), Date.civil(2018, 3, 30), Date.civil(2019, 4, 19)].each do |date|
-  assert_equal 'Good Friday', Holidays.on(date, :mt_en)[0][:name]
-end
+    assert_equal "Feast of Saint Paul's Shipwreck in Malta", (Holidays.on(Date.civil(2017, 2, 10), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Feast of Saint Joseph", (Holidays.on(Date.civil(2017, 3, 19), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Freedom Day", (Holidays.on(Date.civil(2017, 3, 31), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Worker's Day", (Holidays.on(Date.civil(2017, 5, 1), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Sette Giugno", (Holidays.on(Date.civil(2017, 6, 7), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Feast of Saint Peter & Saint Paul", (Holidays.on(Date.civil(2017, 6, 29), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Feast of the Assumption of Our Lady", (Holidays.on(Date.civil(2017, 8, 15), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Victory Day", (Holidays.on(Date.civil(2017, 9, 8), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Independence Day", (Holidays.on(Date.civil(2017, 9, 21), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Feast of the Immaculate Conception", (Holidays.on(Date.civil(2017, 12, 8), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Republic Day", (Holidays.on(Date.civil(2017, 12, 13), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2017, 12, 25), [:mt_en])[0] || {})[:name]
+
+    assert_equal "Good Friday", (Holidays.on(Date.civil(2017, 4, 14), [:mt_en])[0] || {})[:name]
+assert_equal "Good Friday", (Holidays.on(Date.civil(2018, 3, 30), [:mt_en])[0] || {})[:name]
+assert_equal "Good Friday", (Holidays.on(Date.civil(2019, 4, 19), [:mt_en])[0] || {})[:name]
 
   end
 end