[recipes] Update ingredients tests for new parser

[Matthias Clasen <matthiasc src gnome org>]

commit db669122dd3bf38879189e92f78eed8f9ad0db86
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jan 7 16:22:02 2017 -0500

    Update ingredients tests for new parser
    
    We are more restrictive now.

 tests/ingredients-data/valid-1.expected |    2 +-
 tests/ingredients-data/valid-1.in       |    4 ++--
 tests/ingredients-data/valid-2.expected |    4 ++--
 tests/ingredients-data/valid-2.in       |    6 +++---
 tests/ingredients-data/valid-3.expected |    2 +-
 tests/ingredients-data/valid-3.in       |    4 ++--
 tests/ingredients-data/valid-4.expected |   14 +++++++-------
 tests/ingredients-data/valid-4.in       |   16 ++++++++--------
 8 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/tests/ingredients-data/valid-1.expected b/tests/ingredients-data/valid-1.expected
index ce1bd2f..7d53fa0 100644
--- a/tests/ingredients-data/valid-1.expected
+++ b/tests/ingredients-data/valid-1.expected
@@ -8,5 +8,5 @@ NAME Banana
 
 AMOUNT 3/1
 UNIT box
-NAME of nuts
+NAME nuts
 
diff --git a/tests/ingredients-data/valid-1.in b/tests/ingredients-data/valid-1.in
index 00bf6fa..5917040 100644
--- a/tests/ingredients-data/valid-1.in
+++ b/tests/ingredients-data/valid-1.in
@@ -1,3 +1,3 @@
 1 apple
-2 bananas
-3 boxes of nuts
+2 banana
+3 box nuts
diff --git a/tests/ingredients-data/valid-2.expected b/tests/ingredients-data/valid-2.expected
index fec608b..25a6e17 100644
--- a/tests/ingredients-data/valid-2.expected
+++ b/tests/ingredients-data/valid-2.expected
@@ -1,6 +1,6 @@
 AMOUNT 1/2
 UNIT lb
-NAME of butter
+NAME Butter
 
 AMOUNT 2.500000
 UNIT (null)
@@ -8,5 +8,5 @@ NAME Egg
 
 AMOUNT 15/1
 UNIT (null)
-NAME grains of salt
+NAME Salt
 
diff --git a/tests/ingredients-data/valid-2.in b/tests/ingredients-data/valid-2.in
index 31addb4..d9f3ccb 100644
--- a/tests/ingredients-data/valid-2.in
+++ b/tests/ingredients-data/valid-2.in
@@ -1,3 +1,3 @@
-1/2 pound of butter
-2.5 eggs
-15  grains of salt
+1/2 pound butter
+2.5 egg
+15 salt
diff --git a/tests/ingredients-data/valid-3.expected b/tests/ingredients-data/valid-3.expected
index 3be77a6..ff3dd3f 100644
--- a/tests/ingredients-data/valid-3.expected
+++ b/tests/ingredients-data/valid-3.expected
@@ -4,5 +4,5 @@ NAME Wine
 
 AMOUNT 1/2
 UNIT g
-NAME of nutmeg
+NAME nutmeg
 
diff --git a/tests/ingredients-data/valid-3.in b/tests/ingredients-data/valid-3.in
index be24781..d92eaaf 100644
--- a/tests/ingredients-data/valid-3.in
+++ b/tests/ingredients-data/valid-3.in
@@ -1,2 +1,2 @@
-2.123 liters of red wine
-1/2 g of nutmeg
+2.123 l wine
+1/2 g nutmeg
diff --git a/tests/ingredients-data/valid-4.expected b/tests/ingredients-data/valid-4.expected
index c04a3e3..7da2bd2 100644
--- a/tests/ingredients-data/valid-4.expected
+++ b/tests/ingredients-data/valid-4.expected
@@ -1,10 +1,10 @@
 AMOUNT 1/1
 UNIT g
-NAME of salt
+NAME Salt
 
 AMOUNT 2/1
 UNIT kg
-NAME of salt
+NAME Salt
 
 AMOUNT 3/1
 UNIT l
@@ -12,21 +12,21 @@ NAME Wine
 
 AMOUNT 4/1
 UNIT l
-NAME of milk
+NAME Milk
 
 AMOUNT 5/1
 UNIT l
-NAME of beer
+NAME beer
 
 AMOUNT 1/1
 UNIT lb
-NAME of ground beef
+NAME Ground beef
 
 AMOUNT 2/1
 UNIT lb
-NAME of meat
+NAME meat
 
 AMOUNT 1/2
 UNIT box
-NAME of sticks
+NAME sticks
 
diff --git a/tests/ingredients-data/valid-4.in b/tests/ingredients-data/valid-4.in
index d21d381..a7f6fca 100644
--- a/tests/ingredients-data/valid-4.in
+++ b/tests/ingredients-data/valid-4.in
@@ -1,8 +1,8 @@
-1 g of salt
-2 kg of salt
-3 l of wine
-4 liter of milk
-5 liters of beer
-1 pound of ground beef
-2 pounds of meat
-1/2 box of 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