1 files changed, 51 insertions, 18 deletions

diff --git a/src/tests/mx2test.cpp b/src/tests/mx2test.cpp
index 5388b20..676eb8b 100644
--- a/src/tests/mx2test.cpp
+++ b/src/tests/mx2test.cpp
@@ -13,6 +13,7 @@
 #include <tdecmdlineargs.h>
 
 #include <tqstring.h>
+#include <tqfile.h>
 
 #include <iostream>
 using std::cout;
@@ -37,41 +38,73 @@ main(int argc, char *argv[])
 	importer.parseFiles(files);
 
 	Recipe recipe;
-	recipe.title = "Title 1";
+	recipe.title = "Cookies Test";
 	recipe.yield.amount = 2;
 	recipe.yield.type = "servings";
-	recipe.categoryList.append( Element("Category 1") );
-	recipe.categoryList.append( Element("Category 2") );
+	recipe.categoryList.append( Element("Snacks",1) );
+	recipe.categoryList.append( Element("Cookies & Squares",2) );
 	recipe.instructions = 
-		"Instruction line 1\n"
-		"Instruction line 2\n"
-		"Instruction line 3";
+		"1. Drop by spoonful on greased cookie sheet.\n"
+		"\n"
+		"2. Bake in moderate oven.";
+	recipe.prepTime = TQTime(0,30);
+
+	recipe.authorList.append( Element("Colleen Beamer") );
 
 	Ingredient ing;
-	ing.name = "ingredient 1";
-	ing.amount = 1;
-	ing.units.name = "teaspoon";
+	ing.name = "granulated sugar";
+	ing.amount = 0.75;
+	ing.amount_offset = 0.25;
+	ing.units.name = "c.";
 	recipe.ingList.append( ing );
 
 	Ingredient ing2;
-	ing2.name = "ingredient 2";
-	ing2.amount = 3.5;
-	ing2.units.plural = TQString::null;
+	ing2.name = "brown sugar";
+	ing2.amount = 0.75;
+	ing2.amount_offset = 0.25;
+	ing2.units.name = "c.";
 	recipe.ingList.append( ing2 );
 
 	Ingredient ing3;
-	ing3.name = "ingredient 3";
-	ing3.amount = 3.5;
-	ing3.units.plural = "ounces";
+	ing3.name = "all-purpose flour";
+	ing3.amount = 2;
+	ing3.units.plural = "c.";
 	recipe.ingList.append( ing3 );
 
 	Ingredient ing4;
-	ing4.name = "ingredient 4";
-	ing4.amount = 3.5;
-	ing4.units.plural = "ounces";
+	ing4.name = "baking soda";
+	ing4.amount = 1;
+	ing4.units.name = "tsp.";
 	recipe.ingList.append( ing4 );
+
+	Ingredient ing8;
+	ing8.name = "shortening";
+	ing8.amount = 1;
+	ing8.units.name = "c.";
+	ing8.prepMethodList.append( Element("softened, at room temperature") );
+	recipe.ingList.append( ing8 );
+
+	Ingredient ing6;
+	ing6.name = "peanut butter";
+	ing6.amount = 1;
+	ing6.units.name = "c.";
+	recipe.ingList.append( ing6 );
+
+	Ingredient ing5;
+	ing5.name = "eggs";
+	ing5.amount = 2;
+	ing5.units.plural = "";
+	recipe.ingList.append( ing5 );
+
+	Ingredient ing7;
+	ing7.name = "vanilla extract";
+	ing7.amount = 1;
+	ing7.units.name = "tsp.";
+	recipe.ingList.append( ing7 );
 	
 	check( importer, recipe );
 
+	printf("*** mx2 importer passed the tests :-) ***\n");
+
 	printf("Done.\n");
 }