diff --git a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json index a2066a09fab86..07ff668ed4c51 100644 --- a/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json +++ b/tests/integration/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json @@ -630,7 +630,6 @@ "ingredients" : [ { "ciqual_food_code" : "20505", - "ecobalyse_code" : "lentils-uncooked-eu", "id" : "en:green-lentils", "is_in_taxonomy" : 1, "labels" : "en:organic", @@ -685,8 +684,10 @@ "ingredients_with_unspecified_percent_sum" : 100, "ingredients_without_ciqual_codes" : [], "ingredients_without_ciqual_codes_n" : 0, - "ingredients_without_ecobalyse_ids" : [], - "ingredients_without_ecobalyse_ids_n" : 0, + "ingredients_without_ecobalyse_ids" : [ + "en:green-lentils" + ], + "ingredients_without_ecobalyse_ids_n" : 1, "interface_version_created" : "import_csv_file - version 2019/09/17", "known_ingredients_n" : 5, "labels" : "Organic, EU Organic, FR-BIO-01, AB Agriculture Biologique, Agriculture France", diff --git a/tests/unit/expected_test_results/ingredients/es-procedente-e-agricultura-biologica.json b/tests/unit/expected_test_results/ingredients/es-procedente-e-agricultura-biologica.json index 6995763784727..ab38394057a07 100644 --- a/tests/unit/expected_test_results/ingredients/es-procedente-e-agricultura-biologica.json +++ b/tests/unit/expected_test_results/ingredients/es-procedente-e-agricultura-biologica.json @@ -2,7 +2,7 @@ "ingredients" : [ { "ciqual_food_code" : "19023", - "ecobalyse_code" : "milk", + "ecobalyse_code" : "milk-organic", "id" : "en:pasteurised-whole-cow-s-milk", "is_in_taxonomy" : 1, "labels" : "en:organic", diff --git a/tests/unit/expected_test_results/ingredients/fi-organic-label-part-of-ingredient.json b/tests/unit/expected_test_results/ingredients/fi-organic-label-part-of-ingredient.json index e210f57785792..1a95480a35633 100644 --- a/tests/unit/expected_test_results/ingredients/fi-organic-label-part-of-ingredient.json +++ b/tests/unit/expected_test_results/ingredients/fi-organic-label-part-of-ingredient.json @@ -14,7 +14,7 @@ }, { "ciqual_proxy_food_code" : "19051", - "ecobalyse_code" : "milk", + "ecobalyse_code" : "milk-organic", "id" : "en:milk", "is_in_taxonomy" : 1, "labels" : "en:organic", diff --git a/tests/unit/expected_test_results/ingredients/fi-origins.json b/tests/unit/expected_test_results/ingredients/fi-origins.json index eda4565d74e88..a364d88f2f624 100644 --- a/tests/unit/expected_test_results/ingredients/fi-origins.json +++ b/tests/unit/expected_test_results/ingredients/fi-origins.json @@ -40,7 +40,6 @@ }, { "ciqual_proxy_food_code" : "13034", - "ecobalyse_code" : "orange-non-eu", "id" : "en:orange", "is_in_taxonomy" : 1, "labels" : "en:organic", @@ -130,9 +129,10 @@ "ingredients_without_ecobalyse_ids" : [ "en:blackcurrant", "en:cocoa", - "en:cocoa-butter" + "en:cocoa-butter", + "en:orange" ], - "ingredients_without_ecobalyse_ids_n" : 3, + "ingredients_without_ecobalyse_ids_n" : 4, "known_ingredients_n" : 10, "lc" : "fi", "nutriments" : { diff --git a/tests/unit/expected_test_results/ingredients/fr-origins-labels.json b/tests/unit/expected_test_results/ingredients/fr-origins-labels.json index 2f5697cfaef6e..f98319fb73b4e 100644 --- a/tests/unit/expected_test_results/ingredients/fr-origins-labels.json +++ b/tests/unit/expected_test_results/ingredients/fr-origins-labels.json @@ -52,7 +52,6 @@ }, { "ciqual_proxy_food_code" : "13034", - "ecobalyse_code" : "orange-non-eu", "id" : "en:orange", "is_in_taxonomy" : 1, "labels" : "en:organic", @@ -65,7 +64,7 @@ }, { "ciqual_proxy_food_code" : "13009", - "ecobalyse_code" : "lemon-eu", + "ecobalyse_code" : "lemon-organic", "id" : "en:lemon", "is_in_taxonomy" : 1, "labels" : "en:organic", @@ -102,7 +101,7 @@ }, { "ciqual_food_code" : "13008", - "ecobalyse_code" : "cherry-tr", + "ecobalyse_code" : "cherry-organic", "id" : "en:cherry", "is_in_taxonomy" : 1, "labels" : "en:organic", @@ -180,9 +179,10 @@ "en:blackcurrant", "en:cocoa", "en:cocoa-butter", - "en:grapefruit" + "en:grapefruit", + "en:orange" ], - "ingredients_without_ecobalyse_ids_n" : 4, + "ingredients_without_ecobalyse_ids_n" : 5, "known_ingredients_n" : 14, "lc" : "fr", "nutriments" : { diff --git a/tests/unit/expected_test_results/ingredients/fr-percents-origins.json b/tests/unit/expected_test_results/ingredients/fr-percents-origins.json index f07488c6a59ac..50a542f50d7d9 100644 --- a/tests/unit/expected_test_results/ingredients/fr-percents-origins.json +++ b/tests/unit/expected_test_results/ingredients/fr-percents-origins.json @@ -2,7 +2,7 @@ "ingredients" : [ { "ciqual_food_code" : "2074", - "ecobalyse_code" : "apple-fr", + "ecobalyse_code" : "apple-organic", "id" : "en:apple-juice", "is_in_taxonomy" : 1, "labels" : "en:organic", diff --git a/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json b/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json index 67536dab7947a..bedb0e26529dc 100644 --- a/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json +++ b/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json @@ -2,7 +2,7 @@ "ingredients" : [ { "ciqual_proxy_food_code" : "31016", - "ecobalyse_code" : "sugar", + "ecobalyse_code" : "sugar-beet-organic", "id" : "en:cane-sugar", "is_in_taxonomy" : 1, "labels" : "en:organic", @@ -15,7 +15,7 @@ }, { "ciqual_food_code" : "13000", - "ecobalyse_code" : "apricot-eu", + "ecobalyse_code" : "apricot-organic", "id" : "en:apricot", "is_in_taxonomy" : 1, "labels" : "en:organic", diff --git a/tests/unit/expected_test_results/ingredients/fr-starred-label.json b/tests/unit/expected_test_results/ingredients/fr-starred-label.json index 881af2eee4274..82444424302ea 100644 --- a/tests/unit/expected_test_results/ingredients/fr-starred-label.json +++ b/tests/unit/expected_test_results/ingredients/fr-starred-label.json @@ -16,7 +16,7 @@ }, { "ciqual_proxy_food_code" : "31016", - "ecobalyse_code" : "sugar", + "ecobalyse_code" : "sugar-beet-organic", "id" : "en:cane-sugar", "is_in_taxonomy" : 1, "labels" : "en:fair-trade, en:organic", diff --git a/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json b/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json index 9befd174885bc..2beb4c8e3f03a 100644 --- a/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json +++ b/tests/unit/expected_test_results/recipes/fr-margherita-pizzas.fr-margherita-pizza-1.json @@ -2,7 +2,7 @@ "ingredients" : [ { "ciqual_proxy_food_code" : "9410", - "ecobalyse_code" : "flour", + "ecobalyse_code" : "flour-organic", "id" : "en:wheat-flour", "is_in_taxonomy" : 1, "labels" : "en:organic", @@ -15,7 +15,7 @@ }, { "ciqual_food_code" : "20170", - "ecobalyse_code" : "tomato-heated-greenhouse-eu", + "ecobalyse_code" : "tomato-organic", "id" : "en:tomato-puree", "is_in_taxonomy" : 1, "labels" : "en:organic", @@ -41,7 +41,6 @@ }, { "ciqual_food_code" : "19590", - "ecobalyse_code" : "mozzarella", "id" : "en:mozzarella", "is_in_taxonomy" : 1, "labels" : "en:organic", @@ -56,7 +55,7 @@ }, { "ciqual_food_code" : "17440", - "ecobalyse_code" : "sunflower-oil", + "ecobalyse_code" : "sunflower-oil-organic", "from_palm_oil" : "no", "id" : "en:sunflower-oil", "is_in_taxonomy" : 1, @@ -203,11 +202,12 @@ "ingredients_without_ciqual_codes_n" : 2, "ingredients_without_ecobalyse_ids" : [ "en:herb", + "en:mozzarella", "en:salt", "en:spice", "en:yeast" ], - "ingredients_without_ecobalyse_ids_n" : 4, + "ingredients_without_ecobalyse_ids_n" : 5, "known_ingredients_n" : 22, "lc" : "fr", "misc_tags" : [