From 642c53319f985cf7ba8796f5c63b349b0a4efc17 Mon Sep 17 00:00:00 2001
From: Rowan Crawford <rowanc@smx.co.nz>
Date: Wed, 28 Apr 2010 20:50:16 +0800
Subject: [PATCH] Update tests to give more useful information when they fail.

---
 data/SYNTAX    | 2 +-
 data/au.yaml   | 2 +-
 data/ca.yaml   | 2 +-
 data/cz.yaml   | 2 +-
 data/de.yaml   | 2 +-
 data/dk.yaml   | 2 +-
 data/es.yaml   | 2 +-
 data/fr.yaml   | 2 +-
 data/gb.yaml   | 2 +-
 data/ie.yaml   | 2 +-
 data/is.yaml   | 2 +-
 data/it.yaml   | 2 +-
 data/mx.yaml   | 2 +-
 data/nl.yaml   | 2 +-
 data/no.yaml   | 2 +-
 data/nyse.yaml | 2 +-
 data/nz.yaml   | 2 +-
 data/pt.yaml   | 2 +-
 data/se.yaml   | 2 +-
 data/ups.yaml  | 2 +-
 data/us.yaml   | 2 +-
 data/za.yaml   | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/data/SYNTAX b/data/SYNTAX
index bf6384d..b870253 100644
--- a/data/SYNTAX
+++ b/data/SYNTAX
@@ -101,7 +101,7 @@ All definition files should have tests included.  In the YAML file, tests are ju
      Date.civil(2008,9,1) => 'Labour Day',
      Date.civil(2008,12,25) => 'Christmas Day',
      Date.civil(2008,12,26) => 'Boxing Day'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :ca, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :ca, :informal)[0] || {})[:name]
     end
 
     # Victoria Day
diff --git a/data/au.yaml b/data/au.yaml
index da7ec70..909612c 100644
--- a/data/au.yaml
+++ b/data/au.yaml
@@ -91,7 +91,7 @@ tests: |
      Date.civil(2007,4,25) => 'ANZAC Day',
      Date.civil(2007,12,25) => 'Christmas Day',
      Date.civil(2007,12,26) => 'Boxing Day'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :au, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :au, :informal)[0] || {})[:name]
     end
 
     [:au_sa, :au_act, :au_nsw, :au_].each do |r|
diff --git a/data/ca.yaml b/data/ca.yaml
index 2bcd540..451a764 100644
--- a/data/ca.yaml
+++ b/data/ca.yaml
@@ -131,7 +131,7 @@ tests: |
      Date.civil(2008,11,11) => 'Rememberance Day',
      Date.civil(2008,12,25) => 'Christmas Day',
      Date.civil(2008,12,26) => 'Boxing Day'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :ca, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :ca, :informal)[0] || {})[:name]
     end
 
     # Victoria Day
diff --git a/data/cz.yaml b/data/cz.yaml
index aad4314..a873fce 100644
--- a/data/cz.yaml
+++ b/data/cz.yaml
@@ -63,6 +63,6 @@ tests: |
      Date.civil(2010,12,24) => 'Štědrý den',
      Date.civil(2010,12,25) => '1. svátek vánoční',
      Date.civil(2010,12,26) => '2. svátek vánoční'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :cz, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :cz, :informal)[0] || {})[:name]
     end
 
diff --git a/data/de.yaml b/data/de.yaml
index c7c5d6a..d4bfa76 100644
--- a/data/de.yaml
+++ b/data/de.yaml
@@ -81,7 +81,7 @@ tests: |
      Date.civil(2009,10,3) => 'Tag der Deutschen Einheit',
      Date.civil(2009,12,25) => '1. Weihnachtstag',
      Date.civil(2009,12,26) => '2. Weihnachtstag'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :de, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :de, :informal)[0] || {})[:name]
     end
     
     [:de_bw, :de_by, :de_st, :de_].each do |r|
diff --git a/data/dk.yaml b/data/dk.yaml
index b0c94d8..ea1f0fc 100644
--- a/data/dk.yaml
+++ b/data/dk.yaml
@@ -113,5 +113,5 @@ tests: |
      Date.civil(2007,12,24) => 'Juleaftensdag',
      Date.civil(2007,12,25) => '1. juledag',
      Date.civil(2007,12,26) => '2. juledag'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :dk, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :dk, :informal)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/es.yaml b/data/es.yaml
index 3741f2b..5f531c3 100644
--- a/data/es.yaml
+++ b/data/es.yaml
@@ -123,7 +123,7 @@ tests: |
      Date.civil(2009,12,6) => 'Día de la Constitución',
      Date.civil(2009,12,8) => 'Inmaculada Concepción',
      Date.civil(2009,12,25) => 'Navidad del Señor'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :es, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :es, :informal)[0] || {})[:name]
     end
     
     [:es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_].each do |r|
diff --git a/data/fr.yaml b/data/fr.yaml
index b3c0fcd..0cfe761 100644
--- a/data/fr.yaml
+++ b/data/fr.yaml
@@ -66,5 +66,5 @@ tests: |
      Date.civil(2007,11,1) => 'Toussaint',
      Date.civil(2007,11,11) => 'Armistice 1918',
      Date.civil(2007,12,25) => 'Nöel'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :fr, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :fr, :informal)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/gb.yaml b/data/gb.yaml
index 1c5377a..ff6e890 100644
--- a/data/gb.yaml
+++ b/data/gb.yaml
@@ -87,7 +87,7 @@ tests: |
      Date.civil(2008,11,5) => 'Guy Fawkes Day',
      Date.civil(2008,12,25) => 'Christmas Day',
      Date.civil(2008,12,26) => 'Boxing Day'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :gb, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :gb, :informal)[0] || {})[:name]
     end
 
     assert_equal 'St. Patrick\'s Day', Date.civil(2008,3,17).holidays(:gb_nir, :informal)[0][:name]
diff --git a/data/ie.yaml b/data/ie.yaml
index 83c1d7b..784fda0 100644
--- a/data/ie.yaml
+++ b/data/ie.yaml
@@ -54,5 +54,5 @@ tests: |
      Date.civil(2008,8,4) => 'Bank Holiday',
      Date.civil(2008,12,25) => 'Christmas Day',
      Date.civil(2008,12,26) => 'St. Stephen\'s Day'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :ie, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :ie, :informal)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/is.yaml b/data/is.yaml
index 061737f..e4c96ae 100644
--- a/data/is.yaml
+++ b/data/is.yaml
@@ -132,5 +132,5 @@ tests: |
      Date.civil(2007,12,25) => 'Jól',
      Date.civil(2007,12,26) => 'Jól',
      Date.civil(2007,12,31) => 'Gamlárskvöld'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :is, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :is, :informal)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/it.yaml b/data/it.yaml
index 8c8ef32..d187957 100644
--- a/data/it.yaml
+++ b/data/it.yaml
@@ -62,5 +62,5 @@ tests: |
      Date.civil(2007,12,8) => 'Immacolata Concezione',
      Date.civil(2007,12,25) => 'Natale',
      Date.civil(2007,12,26) => 'Santo Stefano'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :it, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :it, :informal)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/mx.yaml b/data/mx.yaml
index 1683c3a..c22d97f 100644
--- a/data/mx.yaml
+++ b/data/mx.yaml
@@ -102,5 +102,5 @@ tests: |
      Date.civil(2007,11,2) => 'Los Fieles Difuntos',
      Date.civil(2007,11,19) => 'Día de la Revolución',
      Date.civil(2007,12,25) => 'Navidad'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :mx, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :mx, :informal)[0] || {})[:name]
     end  
\ No newline at end of file
diff --git a/data/nl.yaml b/data/nl.yaml
index 420ac52..83fe0c7 100644
--- a/data/nl.yaml
+++ b/data/nl.yaml
@@ -63,5 +63,5 @@ tests: |
      Date.civil(2008,5,12) => 'Pinksteren', # Pentecost, Easter+50
      Date.civil(2008,12,25) => 'Kerstmis',
      Date.civil(2008,12,26) => 'Kerstmis'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :nl, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :nl, :informal)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/no.yaml b/data/no.yaml
index dff6dcf..249fb1b 100644
--- a/data/no.yaml
+++ b/data/no.yaml
@@ -78,5 +78,5 @@ tests: |
      Date.civil(2010,5,13) => 'Kristi Himmelfartsdag',
      Date.civil(2010,5,23) => '1. pinsedag',
      Date.civil(2010,5,24) => '2. pinsedag'}.each do |date, name|
-       assert_equal name, Holidays.on(date, :no, :informal)[0][:name]
+       assert_equal name, (Holidays.on(date, :no, :informal)[0] || {})[:name]
      end
\ No newline at end of file
diff --git a/data/nyse.yaml b/data/nyse.yaml
index 9c40b4d..fd1e233 100644
--- a/data/nyse.yaml
+++ b/data/nyse.yaml
@@ -59,5 +59,5 @@ tests: |
      Date.civil(2008,9,1) => 'Labor Day',
      Date.civil(2008,11,27) => 'Thanksgiving',
      Date.civil(2008,12,25) => 'Christmas Day'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :nyse)[0][:name]
+      assert_equal name, (Holidays.on(date, :nyse)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/nz.yaml b/data/nz.yaml
index ef452cf..6b61486 100644
--- a/data/nz.yaml
+++ b/data/nz.yaml
@@ -115,7 +115,7 @@ tests: |
      Date.civil(2007,4,25) => 'ANZAC Day',
      Date.civil(2007,12,25) => 'Christmas Day',
      Date.civil(2007,12,26) => 'Boxing Day'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :nz, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :nz, :informal)[0] || {})[:name]
     end
 methods:
   closest_monday: |
diff --git a/data/pt.yaml b/data/pt.yaml
index 168cb74..d528e64 100644
--- a/data/pt.yaml
+++ b/data/pt.yaml
@@ -81,5 +81,5 @@ tests: |
      Date.civil(2008,12,1) => 'Restauração da Independência',
      Date.civil(2008,12,8) => 'Imaculada Conceição',
      Date.civil(2008,12,25) => 'Natal'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :pt, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :pt, :informal)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/se.yaml b/data/se.yaml
index 7324c25..7694f48 100644
--- a/data/se.yaml
+++ b/data/se.yaml
@@ -87,5 +87,5 @@ tests: |
      Date.civil(2008,11,1) => 'Alla helgons dag',
      Date.civil(2008,12,25) => 'Juldagen',
      Date.civil(2008,12,26) => 'Annandag jul'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :se, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :se, :informal)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/ups.yaml b/data/ups.yaml
index 4ffcf17..02e3c1b 100644
--- a/data/ups.yaml
+++ b/data/ups.yaml
@@ -52,5 +52,5 @@ tests: |
      Date.civil(2008,11,28) => 'Day After Thanksgiving',
      Date.civil(2008,12,25) => 'Christmas Day',
      Date.civil(2008,12,31) => 'New Year\'s Eve',}.each do |date, name|
-      assert_equal name, Holidays.on(date, :ups)[0][:name]
+      assert_equal name, (Holidays.on(date, :ups)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/us.yaml b/data/us.yaml
index 0137baa..9ceb13e 100644
--- a/data/us.yaml
+++ b/data/us.yaml
@@ -77,5 +77,5 @@ tests: |
      Date.civil(2008,11,11) => 'Veterans Day',
      Date.civil(2008,11,27) => 'Thanksgiving',
      Date.civil(2008,12,25) => 'Christmas Day'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :us)[0][:name]
+      assert_equal name, (Holidays.on(date, :us)[0] || {})[:name]
     end
\ No newline at end of file
diff --git a/data/za.yaml b/data/za.yaml
index 4560ca2..38b5079 100644
--- a/data/za.yaml
+++ b/data/za.yaml
@@ -74,5 +74,5 @@ tests: |
      Date.civil(2007,12,16) => 'Day of Reconciliation',
      Date.civil(2007,12,25) => 'Christmas Day',
      Date.civil(2007,12,26) => 'Day of Goodwill'}.each do |date, name|
-      assert_equal name, Holidays.on(date, :za, :informal)[0][:name]
+      assert_equal name, (Holidays.on(date, :za, :informal)[0] || {})[:name]
     end
\ No newline at end of file