[recipes] Fix up ingredients tests to pass



commit 8e0d05d24ae6b8c58e86bfca7284d036b71a7b91
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Feb 19 13:46:57 2017 -0500

    Fix up ingredients tests to pass
    
    This was broken when I removed the old parser.

 tests/ingredients-data/valid-1.expected |    4 ++--
 tests/ingredients-data/valid-1.in       |    6 +++---
 tests/ingredients-data/valid-2.expected |    4 ++--
 tests/ingredients-data/valid-2.in       |    6 +++---
 tests/ingredients-data/valid-3.in       |    4 ++--
 tests/ingredients-data/valid-4.in       |   16 ++++++++--------
 6 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/tests/ingredients-data/valid-1.expected b/tests/ingredients-data/valid-1.expected
index 7d53fa0..f70f114 100644
--- a/tests/ingredients-data/valid-1.expected
+++ b/tests/ingredients-data/valid-1.expected
@@ -1,9 +1,9 @@
 AMOUNT 1/1
-UNIT (null)
+UNIT 
 NAME Apple
 
 AMOUNT 2/1
-UNIT (null)
+UNIT 
 NAME Banana
 
 AMOUNT 3/1
diff --git a/tests/ingredients-data/valid-1.in b/tests/ingredients-data/valid-1.in
index 5917040..157b1af 100644
--- a/tests/ingredients-data/valid-1.in
+++ b/tests/ingredients-data/valid-1.in
@@ -1,3 +1,3 @@
-1 apple
-2 banana
-3 box nuts
+1              apple   
+2              banana  
+3      box     nuts    
diff --git a/tests/ingredients-data/valid-2.expected b/tests/ingredients-data/valid-2.expected
index 25a6e17..a0c5d5e 100644
--- a/tests/ingredients-data/valid-2.expected
+++ b/tests/ingredients-data/valid-2.expected
@@ -3,10 +3,10 @@ UNIT lb
 NAME Butter
 
 AMOUNT 2.500000
-UNIT (null)
+UNIT 
 NAME Egg
 
 AMOUNT 15/1
-UNIT (null)
+UNIT 
 NAME Salt
 
diff --git a/tests/ingredients-data/valid-2.in b/tests/ingredients-data/valid-2.in
index d9f3ccb..e9ab39f 100644
--- a/tests/ingredients-data/valid-2.in
+++ b/tests/ingredients-data/valid-2.in
@@ -1,3 +1,3 @@
-1/2 pound butter
-2.5 egg
-15 salt
+1/2    pound   butter  
+2.5            egg     
+15             salt    
diff --git a/tests/ingredients-data/valid-3.in b/tests/ingredients-data/valid-3.in
index d92eaaf..608a8ba 100644
--- a/tests/ingredients-data/valid-3.in
+++ b/tests/ingredients-data/valid-3.in
@@ -1,2 +1,2 @@
-2.123 l wine
-1/2 g nutmeg
+2.123  l       wine    
+1/2    g       nutmeg  
diff --git a/tests/ingredients-data/valid-4.in b/tests/ingredients-data/valid-4.in
index a7f6fca..483937f 100644
--- a/tests/ingredients-data/valid-4.in
+++ b/tests/ingredients-data/valid-4.in
@@ -1,8 +1,8 @@
-1 g salt
-2 kg salt
-3 l wine
-4 liter milk
-5 liter beer
-1 pound ground beef
-2 pound meat
-1/2 box sticks
+1      g       salt    
+2      kg      salt    
+3      l       wine    
+4      liter   milk    
+5      liter   beer    
+1      pound   ground beef     
+2      pound   meat    
+1/2    box     sticks  


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]