[recipes] Update the unit tests for the demise of plurals

[Matthias Clasen <matthiasc src gnome org>]

commit 4067885d6c0f73f9da440fe24f64183b730fd706
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jan 7 16:12:39 2017 -0500

    Update the unit tests for the demise of plurals

 tests/unit-data/unit1.expected |  142 ----------------------------------------
 tests/unit-data/unit1.in       |   16 -----
 tests/unit.c                   |    1 -
 3 files changed, 0 insertions(+), 159 deletions(-)
---
diff --git a/tests/unit-data/unit1.expected b/tests/unit-data/unit1.expected
index 95dbfac..57e273d 100644
--- a/tests/unit-data/unit1.expected
+++ b/tests/unit-data/unit1.expected
@@ -2,321 +2,179 @@ INPUT 'gram'
 REST ''
 UNIT g
 NAME gram
-PLURAL grams
-ABBREVIATION g
-
-INPUT 'grams'
-REST ''
-UNIT g
-NAME gram
-PLURAL grams
 ABBREVIATION g
 
 INPUT 'g'
 REST ''
 UNIT g
 NAME gram
-PLURAL grams
 ABBREVIATION g
 
 INPUT 'kilogram'
 REST ''
 UNIT kg
 NAME kilogram
-PLURAL kilograms
-ABBREVIATION kg
-
-INPUT 'kilograms'
-REST ''
-UNIT kg
-NAME kilogram
-PLURAL kilograms
 ABBREVIATION kg
 
 INPUT 'kg'
 REST ''
 UNIT kg
 NAME kilogram
-PLURAL kilograms
 ABBREVIATION kg
 
 INPUT 'lb'
 REST ''
 UNIT lb
 NAME pound
-PLURAL pounds
 ABBREVIATION lb
 
 INPUT 'pound'
 REST ''
 UNIT lb
 NAME pound
-PLURAL pounds
-ABBREVIATION lb
-
-INPUT 'pounds'
-REST ''
-UNIT lb
-NAME pound
-PLURAL pounds
 ABBREVIATION lb
 
 INPUT 'ounce'
 REST ''
 UNIT oz
 NAME ounce
-PLURAL ounces
-ABBREVIATION oz
-
-INPUT 'ounces'
-REST ''
-UNIT oz
-NAME ounce
-PLURAL ounces
 ABBREVIATION oz
 
 INPUT 'oz'
 REST ''
 UNIT oz
 NAME ounce
-PLURAL ounces
 ABBREVIATION oz
 
 INPUT 'liter'
 REST ''
 UNIT l
 NAME liter
-PLURAL liters
-ABBREVIATION l
-
-INPUT 'liters'
-REST ''
-UNIT l
-NAME liter
-PLURAL liters
 ABBREVIATION l
 
 INPUT 'l'
 REST ''
 UNIT l
 NAME liter
-PLURAL liters
 ABBREVIATION l
 
 INPUT 'deciliter'
 REST ''
 UNIT dl
 NAME deciliter
-PLURAL deciliters
-ABBREVIATION dl
-
-INPUT 'deciliters'
-REST ''
-UNIT dl
-NAME deciliter
-PLURAL deciliters
 ABBREVIATION dl
 
 INPUT 'dl'
 REST ''
 UNIT dl
 NAME deciliter
-PLURAL deciliters
 ABBREVIATION dl
 
 INPUT 'milliliter'
 REST ''
 UNIT ml
 NAME milliliter
-PLURAL milliliters
-ABBREVIATION ml
-
-INPUT 'milliliters'
-REST ''
-UNIT ml
-NAME milliliter
-PLURAL milliliters
 ABBREVIATION ml
 
 INPUT 'ml'
 REST ''
 UNIT ml
 NAME milliliter
-PLURAL milliliters
 ABBREVIATION ml
 
 INPUT 'fluid ounce'
 REST ''
 UNIT fl oz
 NAME fluid ounce
-PLURAL fluid ounces
-ABBREVIATION fl oz
-
-INPUT 'fluid ounces'
-REST ''
-UNIT fl oz
-NAME fluid ounce
-PLURAL fluid ounces
 ABBREVIATION fl oz
 
 INPUT 'fl oz'
 REST ''
 UNIT fl oz
 NAME fluid ounce
-PLURAL fluid ounces
 ABBREVIATION fl oz
 
 INPUT 'pint'
 REST ''
 UNIT pt
 NAME pint
-PLURAL pints
-ABBREVIATION pt
-
-INPUT 'pints'
-REST ''
-UNIT pt
-NAME pint
-PLURAL pints
 ABBREVIATION pt
 
 INPUT 'pt'
 REST ''
 UNIT pt
 NAME pint
-PLURAL pints
 ABBREVIATION pt
 
 INPUT 'quart'
 REST ''
 UNIT qt
 NAME quart
-PLURAL quarts
-ABBREVIATION qt
-
-INPUT 'quarts'
-REST ''
-UNIT qt
-NAME quart
-PLURAL quarts
 ABBREVIATION qt
 
 INPUT 'qt'
 REST ''
 UNIT qt
 NAME quart
-PLURAL quarts
 ABBREVIATION qt
 
 INPUT 'gallon'
 REST ''
 UNIT gal
 NAME gallon
-PLURAL gallons
-ABBREVIATION gal
-
-INPUT 'gallons'
-REST ''
-UNIT gal
-NAME gallon
-PLURAL gallons
 ABBREVIATION gal
 
 INPUT 'gal'
 REST ''
 UNIT gal
 NAME gallon
-PLURAL gallons
 ABBREVIATION gal
 
 INPUT 'cup'
 REST ''
 UNIT cup
 NAME cup
-PLURAL cups
-ABBREVIATION cup
-
-INPUT 'cups'
-REST ''
-UNIT cup
-NAME cup
-PLURAL cups
 ABBREVIATION cup
 
 INPUT 'tablespoon'
 REST ''
 UNIT tbsp
 NAME tablespoon
-PLURAL tablespoons
-ABBREVIATION tbsp
-
-INPUT 'tablespoons'
-REST ''
-UNIT tbsp
-NAME tablespoon
-PLURAL tablespoons
 ABBREVIATION tbsp
 
 INPUT 'tbsp'
 REST ''
 UNIT tbsp
 NAME tablespoon
-PLURAL tablespoons
 ABBREVIATION tbsp
 
 INPUT 'teaspoon'
 REST ''
 UNIT tsp
 NAME teaspoon
-PLURAL teaspoons
-ABBREVIATION tsp
-
-INPUT 'teaspoons'
-REST ''
-UNIT tsp
-NAME teaspoon
-PLURAL teaspoons
 ABBREVIATION tsp
 
 INPUT 'tsp'
 REST ''
 UNIT tsp
 NAME teaspoon
-PLURAL teaspoons
 ABBREVIATION tsp
 
 INPUT 'box'
 REST ''
 UNIT box
 NAME box
-PLURAL boxes
-ABBREVIATION box
-
-INPUT 'boxes'
-REST ''
-UNIT box
-NAME box
-PLURAL boxes
 ABBREVIATION box
 
 INPUT 'package'
 REST ''
 UNIT pkg
 NAME package
-PLURAL packages
-ABBREVIATION pkg
-
-INPUT 'packages'
-REST ''
-UNIT pkg
-NAME package
-PLURAL packages
 ABBREVIATION pkg
 
 INPUT 'pkg'
 REST ''
 UNIT pkg
 NAME package
-PLURAL packages
 ABBREVIATION pkg
 
diff --git a/tests/unit-data/unit1.in b/tests/unit-data/unit1.in
index 1c15ae4..3a85a11 100644
--- a/tests/unit-data/unit1.in
+++ b/tests/unit-data/unit1.in
@@ -1,46 +1,30 @@
 gram
-grams
 g
 kilogram
-kilograms
 kg
 lb
 pound
-pounds
 ounce
-ounces
 oz
 liter
-liters
 l
 deciliter
-deciliters
 dl
 milliliter
-milliliters
 ml
 fluid ounce
-fluid ounces
 fl oz
 pint
-pints
 pt
 quart
-quarts
 qt
 gallon
-gallons
 gal
 cup
-cups
 tablespoon
-tablespoons
 tbsp
 teaspoon
-teaspoons
 tsp
 box
-boxes
 package
-packages
 pkg
diff --git a/tests/unit.c b/tests/unit.c
index 13c675f..07d2509 100644
--- a/tests/unit.c
+++ b/tests/unit.c
@@ -46,7 +46,6 @@ test_line (const char *line)
                 g_string_append_printf (string, "REST '%s'\n", input);
                 g_string_append_printf (string, "UNIT %s\n", unit);
                 g_string_append_printf (string, "NAME %s\n", gr_unit_get_display_name (unit));
-                g_string_append_printf (string, "PLURAL %s\n", gr_unit_get_plural (unit));
                 g_string_append_printf (string, "ABBREVIATION %s\n", gr_unit_get_abbreviation (unit));
         }