From 7d63fc2f6f411c4e8ce0c923b7f2ab9f36741455 Mon Sep 17 00:00:00 2001
From: Stefano Mazzocchi <stefano@apache.org>
Date: Wed, 5 May 2010 02:23:23 +0000
Subject: [PATCH] fixing tests

git-svn-id: http://google-refine.googlecode.com/svn/trunk@605 7d457c2a-affb-35e4-300a-418c747d4874
---
 gridworks                                 | 4 ++--
 tests/data/food.csv                       | 2 +-
 tests/windmill/js/test_basic_functions.js | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gridworks b/gridworks
index 4bdf70f0e..c1eea9fb5 100755
--- a/gridworks
+++ b/gridworks
@@ -498,9 +498,9 @@ ui_test() {
     sleep 3
     echo ""
     
-    echo "Starting Windmill..."
+    echo "Starting Windmill... (press COMMAND-c or CTRL-c to exit)"
     if [ -z "$INTERACTIVE" ]; then
-        $WINDMILL firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ jsdir=$GRIDWORKS_TEST_DIR/windmill/js exit > /dev/null
+        $WINDMILL firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ jsdir=$GRIDWORKS_TEST_DIR/windmill/js > /dev/null
     else
         $WINDMILL firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ > /dev/null
     fi
diff --git a/tests/data/food.csv b/tests/data/food.csv
index de485f45b..5950389f6 100644
--- a/tests/data/food.csv
+++ b/tests/data/food.csv
@@ -6752,7 +6752,7 @@ NDB_No,Shrt_Desc,Water,Energ_Kcal,Protein,Lipid_Tot,Ash,Carbohydrt,Fiber_TD,Suga
 22930,"CAMPBELL,SPAGHETTIOS,SPAGHETTI IN TOMATO & CHS SAU",79.7,80,2.78,0.6,1.05,15.87,1.200000048,5.159999847,8,0.29,,,,377,,,,,0,0.06,0.067,1.19,,,32,,,,,,79,,,,,,,,,,0.198,,,2,252,"1 cup,  (1 serving)",,,0
 22931,"CAMPBELL SOUP COMPANY,SPAGHETTIOS,SPAGHETTIOS ORIGINAL",81.4,71,2.38,0,1.14,14.68,1.200000048,5.159999847,8,0.71,,,,250,,,,,0,0.06,0.101,1.19,,,40,,,,,,198,,,,,,,,,,0,,,2,252,"1 cup,  (1 serving)",,,0
 22932,"CAMPBELL SOUP COMPANY,SPAGHETTIOS,SPAGHETTIOS A TO Z'S",81.4,70,2.38,0.4,1.54,14.29,1.200000048,5.949999809,60,1.07,,,,349,,,,,2.4,0.06,0.101,1.19,,,40,,,,,,298,,,,,,,,,,0.198,,,2,252,"1 cup,  (1 serving)",,,0
-22935," SPAGHETTIOS,  Danny PhantomShaped Pasta with Sliced Franks",79,92,3.57,2.78,1.56,13.1,0.800000012,4.760000229,60,1.07,,,,393,,,,,2.4,0.06,0.101,1.19,,,40,,,,,,198,,,,,,,,,,0.992,,,8,252,"1 serving,  (1 serving)",,,0
+22935,"SPAGHETTIOS, Danny PhantomShaped Pasta with Sliced Franks",79,92,3.57,2.78,1.56,13.1,0.800000012,4.760000229,60,1.07,,,,393,,,,,2.4,0.06,0.101,1.19,,,40,,,,,,198,,,,,,,,,,0.992,,,8,252,"1 serving,  (1 serving)",,,0
 22936,"CAMPBELL, SPAGHETTIOS,DORA THE EXPLORERSHAPED PASTA",81.4,65,2.38,0.4,2.73,13.1,1.200000048,3.569999933,60,1.43,,,,337,,,,,2.4,0.06,0.101,1.19,,,40,,,,,,198,,,,,,,,,,0.198,,,0,252,"1 cup,  (1 serving)",,,0
 22937,"CAMPBELL SOUP COMPANY,SPAGHETTIOS,SPAGHETTIOS IN MEAT SAU",82.4,69,3.17,0.79,1.33,12.3,1.200000048,4.760000229,60,1.43,,,,353,,,,,0,0.06,0.067,1.19,,,24,,,,,,397,,,,,,,,,,0.397,,,4,252,"1 cup,  (1 serving)",,,0
 22938,"CAMPBELL ,SPAGHETTIOS,SPAGHETTIOS PLUS CA",81.7,69,2.38,0.4,1.63,13.89,1.200000048,5.159999847,119,0.71,,,,246,,,,,2.4,0.06,0.067,1.19,,,32,,,,,,198,,,,,,,,,,0.198,,,2,252,"1 cup,  (1 serving)",,,0
diff --git a/tests/windmill/js/test_basic_functions.js b/tests/windmill/js/test_basic_functions.js
index 3ed9aa371..684576114 100644
--- a/tests/windmill/js/test_basic_functions.js
+++ b/tests/windmill/js/test_basic_functions.js
@@ -46,8 +46,9 @@ var test_basic_functions = new function () {
     this.test_wait_for_value = {method: "waits.forElement", params: { jquery: '("td:contains(\'value.split\')")[0]'} };
     this.test_click_button = function () { wm.actions.click( { jquery: '("button:contains(\'OK\')")[0]'} ); };
     this.test_wait_for_link = {method: "waits.forElement", params: { jquery: '(".ui-button-text:contains(\'count\')")[0]'} };
-    this.test_sort_worked= function () { asserts.gw.expected_top_value("SPAGHETTIOS"); };
+    this.test_facet_worked= function () { asserts.gw.expected_top_value("ABALONE"); };
     this.test_sort_by_count = function () { wm.actions.click( { jquery: '(".ui-button-text:contains(\'count\')")[0]'} ); };
+    this.test_wait_for_count = {method: "waits.forElement", params: { jquery: '(".ui-state-active .ui-button-text:contains(\'count\')")[0]'} };
     this.test_sort_worked= function () { asserts.gw.expected_top_value("BEEF"); };
     
 }();