From 3e5d5804f6540d8ea83580e04707949d8ad7b59e Mon Sep 17 00:00:00 2001
From: Patrick Donelan <pat@patspam.com>
Date: Tue, 16 Jun 2009 06:25:09 +0000
Subject: [PATCH] Made Survey tests a little less dependent on multiple choice
 bundle defaults

---
 t/Asset/Wobject/Survey/SurveyJSON.t | 9 ++++-----
 t/Asset/Wobject/Survey/Test.t       | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/t/Asset/Wobject/Survey/SurveyJSON.t b/t/Asset/Wobject/Survey/SurveyJSON.t
index 1da1b816b..267223ecb 100644
--- a/t/Asset/Wobject/Survey/SurveyJSON.t
+++ b/t/Asset/Wobject/Survey/SurveyJSON.t
@@ -1393,7 +1393,6 @@ my $answerBundle = $surveyJSON->getMultiChoiceBundle('Yes/No');
 $surveyJSON->addAnswersToQuestion( [3,0],
     $answerBundle,
 );
-
 cmp_deeply(
     $surveyJSON->question([3,0]),
     superhashof({
@@ -1401,14 +1400,14 @@ cmp_deeply(
             superhashof({
                 text     => 'Yes',
                 verbatim => 0,
-                recordedAnswer => 1,
-                value => 1,
+                recordedAnswer => $answerBundle->[0]{recordedAnswer},
+                value => $answerBundle->[0]{value},
             }),
             superhashof({
                 text     => 'No',
                 verbatim => 0,
-                recordedAnswer => 0,
-                value => 1,
+                recordedAnswer => $answerBundle->[1]{recordedAnswer},
+                value => $answerBundle->[1]{value},
             }),
         ],
     }),
diff --git a/t/Asset/Wobject/Survey/Test.t b/t/Asset/Wobject/Survey/Test.t
index 616a160f4..c76ec91a0 100644
--- a/t/Asset/Wobject/Survey/Test.t
+++ b/t/Asset/Wobject/Survey/Test.t
@@ -631,7 +631,7 @@ $spec = <<END_SPEC;
 [ 
     { 
         "sequence" : { 
-            "S0Q0" : { "recordedAnswer" : "desc", "score" : "cons" }, # This is a default Yes/No (score all 1)
+            "S0Q0" : { "recordedAnswer" : "desc"}, # This is a default Yes/No (score all 1)
             "S4Q0" : { "recordedAnswer" : "asc" },                    # Certainty scale, with recordedAnswer 0 .. 11
             "S3Q0" : { "recordedAnswer" : "desc", "score" : "desc" }, # These 3 are yes/no questions where we have
             "S3Q1" : { "recordedAnswer" : "desc", "score" : "desc" }, # ..set the score on the No answer to zero, hence