fixing up test code. not part of build system yet

xpinstall/wizard/windows/test/test1.js

@@ -15,20 +15,22 @@ var jarSrc  = "test1.txt";
 var err;
 
 err = startInstall("Acceptance: test1", "install test file 1", vi, 0);
-logComment("startInstall returned: " + err);
+logComment("startInstall() returned: " + err);
 
 f   = getFolder("Program", "testxpi");
 logComment("getFolder() returned: " + f);
 
-err = addSubcomponent(regName, vi, jarSrc, f, jarSrc, true);
-logComment("addSubComponent returned: " + err);
+err = addFile(regName, vi, jarSrc, f, jarSrc, true);
+logComment("addFile() returned: " + err);
 
-if(0 == getLastError())
+
+err = getLastError();
+if(0 == err)
 {
 	err = finalizeInstall();
-  logComment("finalizeInstall returned: " + err);
+  logComment("finalizeInstall() returned: " + err);
 }
 else
 {
-	abortInstall();
+	abortInstall(err);
 }

xpinstall/wizard/windows/test/test2.js

@@ -11,24 +11,25 @@
 
 var regName = "testxpi test 2";
 var vi      = "2.0.1.9"
-var jarSrc  = "test1.txt";
+var jarSrc  = "test2.txt";
 var err;
 
 err = startInstall("Acceptance: test2", "install test file 2", vi, 0);
-logComment("startInstall returned: " + err);
+logComment("startInstall() returned: " + err);
 
 f   = getFolder("Program", "testxpi");
 logComment("getFolder() returned: " + f);
 
-err = addSubcomponent(regName, vi, jarSrc, f, jarSrc, true);
-logComment("addSubComponent returned: " + err);
+err = addFile(regName, vi, jarSrc, f, jarSrc, true);
+logComment("addFile() returned: " + err);
 
-if(0 == getLastError())
+err == getLastError();
+if(0 == err)
 {
 	err = finalizeInstall();
-  logComment("finalizeInstall returned: " + err);
+  logComment("finalizeInstall() returned: " + err);
 }
 else
 {
-	abortInstall();
+	abortInstall(err);
 }

xpinstall/wizard/windows/test/testxpi.c

@@ -56,6 +56,9 @@ void PrintError(LPSTR szMsg, DWORD dwErrorCodeSH, int iExitCode)
 
   printf("%s\n", szErrorString);
   printf("exit code: %d\n", iExitCode);
+  if(iExitCode == 0)
+    printf("\n** Success! **\n");
+
   DeInitializeXPIStub();
   exit(iExitCode);
 }

xpinstall/wizard/windows/test/xpi.c

@@ -134,6 +134,7 @@ HRESULT SmartUpdateJars(LPSTR szAppName, LPSTR szAppPath, LPSTR listArchive[])
         /* break out of the for loop */
         break;
       }
+      printf("\n");
     }
 
     pfnXpiExit();
@@ -158,9 +159,9 @@ void cbXPIProgress(const char* msg, PRInt32 val, PRInt32 max)
 
   ParsePath((char *)msg, szFilename, sizeof(szFilename), PP_FILENAME_ONLY);
   if(max == 0)
-    printf("Processing: %s", szFilename);
+    printf("Processing: %s\n", szFilename);
   else
-    printf("Installing: %d/%d %s", val, max, szFilename);
+    printf("Installing: %d/%d %s\n", val, max, szFilename);
 
   ProcessWindowsMessages();
 }