FCL/sf/app/jrt: comparison javamanager/javainstaller/installer/tsrc/javasrc/com/nokia/mj/impl/installer/InstallerEngineTest.java

equal deleted inserted replaced

-:e5618cc85d74
+:6c158198356e
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 public void installerMain(String[] aArgs)
 {
 TestSuite suite = new TestSuite(this.getClass().getName());
+String runIndex = System.getProperty("com.nokia.mj.impl.installer.test.param1");
 if (Platform.isLinux())
 {
 // In S60 this would be interactive test, so disable it there.
 suite.addTest(new InstallerEngineTest("testTrustedJadNonSilentOk", new TestMethod()
 {
 ((InstallerEngineTest)tc).testTrustedJadNonSilentOk();
 }
 }));
 }
+if (runIndex == null || runIndex.equalsIgnoreCase("run1"))
+{
+// Run 1
 suite.addTest(new InstallerEngineTest("testMidletMessageOk", new TestMethod()
 {
 public void run(TestCase tc)
 {
 ((InstallerEngineTest)tc).testMidletMessageOk();
 public void run(TestCase tc)
 {
 ((InstallerEngineTest)tc).test3AppsOk();
 }
 }));
+}
+if (runIndex == null || runIndex.equalsIgnoreCase("run2"))
+{
+// Run 2
 suite.addTest(new InstallerEngineTest("testDownloadJadOk", new TestMethod()
 {
 public void run(TestCase tc)
 {
 ((InstallerEngineTest)tc).testDownloadJadOk();
 public void run(TestCase tc)
 {
 ((InstallerEngineTest)tc).testNoJavaBinRoot();
 }
 }));
+}
+if (runIndex == null || runIndex.equalsIgnoreCase("run3"))
+{
+// Run 3
 suite.addTest(new InstallerEngineTest("testBlockUninstall", new TestMethod()
 {
 public void run(TestCase tc)
 {
 ((InstallerEngineTest)tc).testBlockUninstall();
 public void run(TestCase tc)
 {
 ((InstallerEngineTest)tc).testApplicationInfo();
 }
 }));
+}
+if (runIndex == null || runIndex.equalsIgnoreCase("run4"))
+{
+// Run 4
 suite.addTest(new InstallerEngineTest("testInstallOptions", new TestMethod()
 {
 public void run(TestCase tc)
 {
 ((InstallerEngineTest)tc).testInstallOptions();
 public void run(TestCase tc)
 {
 ((InstallerEngineTest)tc).testInstallAuthAndBig();
 }
 }));
+}
 com.nokia.mj.impl.utils.OmjTestRunner.run(suite);
 }
 public InstallerEngineTest()
 public void assertNoIsDir()
 {
 assertTrue("IntegrityService root dir exists",
 !FileUtils.exists(FileUtils.getIntegrityServiceRoot()));
+}
+/**
+*/
+public String getTestServer()
+{
+String server = System.getProperty("com.nokia.mj.impl.installer.test.server");
+assertNotNull("-server=<address>:<port> argument required.", server);
+return server;
 }
 /**
 * Makes installation, update and uninstallation for given application.
 * Does the following steps:
 assertTrue("does not exist after installation: " + aFilename, iItu.exists(aSuite));
 // Check that IntegrityService root dir does not exist.
 assertNoIsDir();
 // List.
-Log.logOut("InstallerEngineTest.doInstallUninstall: list -v");
+//Log.logOut("InstallerEngineTest.doInstallUninstall: list -v");
-result = Installer.mainWithResult(new String[] { "list", "-v" });
+//result = Installer.mainWithResult(new String[] { "list", "-v" });
-assertResult(result, Installer.ERR_NONE);
+//assertResult(result, Installer.ERR_NONE);
-Log.logOut("InstallerEngineTest.doInstallUninstall: list -otastatus");
+//Log.logOut("InstallerEngineTest.doInstallUninstall: list -otastatus");
-result = Installer.mainWithResult(new String[] { "list", "-otastatus" });
+//result = Installer.mainWithResult(new String[] { "list", "-otastatus" });
-assertResult(result, Installer.ERR_NONE);
+//assertResult(result, Installer.ERR_NONE);
 // Update with cancellation.
 Log.logOut("InstallerEngineTest.doInstallUninstall: update with cancellation " + aFilename);
 result = Installer.mainWithResult(cancelArgs);
 // Check result code.
 }
 public void testDownloadJadOk()
 {
 Log.logOut("InstallerEngineTest.testDownloadJadOk begins");
-SuiteInfo suite = new SuiteInfo("JBenchmark2", "Kishonti LP");
+SuiteInfo suite = new SuiteInfo("HelloWorld", "Nokia");
-doInstallUninstall(suite, "http://195.134.231.83:7070/omjserver/resources/omj/T00000900_JBenchmark2_gcf.jsp", true, iDefaultOptions);
+doInstallUninstall(suite, "http://" + getTestServer() + "/installertest/HelloWorld_ota.jad", true, iDefaultOptions);
 }
 public void testDownloadJarOk()
 {
 Log.logOut("InstallerEngineTest.testDownloadJarOk begins");
-SuiteInfo suite = new SuiteInfo("JBenchmark2", "Kishonti LP");
+SuiteInfo suite = new SuiteInfo("HelloWorld", "Nokia");
-doInstallUninstall(suite, "http://195.134.231.83:7070/omjserver/resources/omj/JBenchmark2.jar", false, iDefaultOptions);
+doInstallUninstall(suite, "http://" + getTestServer() + "/installertest/HelloWorld.jar", false, iDefaultOptions);
 }
 public void testDownloadJadHttpRedirectOk()
 {
 Log.logOut("InstallerEngineTest.testDownloadJadHttpRedirectOk begins");
-SuiteInfo suite = new SuiteInfo("JBenchmark2", "Kishonti LP");
+SuiteInfo suite = new SuiteInfo("HelloWorld_redirect", "Nokia");
-doInstallUninstall(suite, "http://195.134.231.83:7070/RedirectServlet/redirect?name=JBenchmark2.jad&count=5", true, iDefaultOptions);
+doInstallUninstall(suite, "http://" + getTestServer() + "/installertest/redirect?name=HelloWorld_redirect.jad&count=5", true, iDefaultOptions);
 }
 public void testDownloadJarHttpRedirectOk()
 {
 Log.logOut("InstallerEngineTest.testDownloadJarHttpRedirectOk begins");
-SuiteInfo suite = new SuiteInfo("JBenchmark2", "Kishonti LP");
+SuiteInfo suite = new SuiteInfo("HelloWorld_redirect", "Nokia");
-doInstallUninstall(suite, "http://195.134.231.83:7070/RedirectServlet/redirect?name=JBenchmark2.jar", false, iDefaultOptions);
+doInstallUninstall(suite, "http://" + getTestServer() + "/installertest/redirect?name=HelloWorld_redirect.jar", false, iDefaultOptions);
 }
 public void testDownloadJadHttpAuthOk()
 {
 Log.logOut("InstallerEngineTest.testDownloadJadHttpAuthOk begins");
-SuiteInfo suite = new SuiteInfo("DS_Snow_http_auth", "DS_Effects");
+SuiteInfo suite = new SuiteInfo("HelloWorld_http_auth", "Nokia");
 iDefaultOptions.addElement("-username=guest");
 iDefaultOptions.addElement("-password=guest");
-doInstallUninstall(suite, "http://195.134.231.83:7070/httpauth/DS_Snow_http_auth.jad", true, iDefaultOptions);
+doInstallUninstall(suite, "http://" + getTestServer() + "/installertest/httpauth/HelloWorld_http_auth.jad", true, iDefaultOptions);
 }
 public void testDownloadJadHttpAuthNok()
 {
 Log.logOut("InstallerEngineTest.testDownloadJadHttpAuthNok begins");
 String[] args = new String[]
 {
 "install",
 "-silent",
-"-jad=http://195.134.231.83:7070/httpauth/DS_Snow_http_auth.jad",
+"-jad=http://" + getTestServer() + "/installertest/httpauth/HelloWorld_http_auth.jad",
 };
 int result = Installer.mainWithResult(args);
 // Check result code.
 assertResult(result, Installer.ERR_CANCEL);
 // Check exception
 assertTrue("failed installation returns incorrect exception " +
 Installer.getExecuteException(),
 iItu.isExceptionReason
 (Installer.getExecuteException(),
 InstallerErrorMessage.INST_CANCEL,
-InstallerDetailedErrorMessage.NO_MSG,
+InstallerDetailedErrorMessage.INST_CANCEL,
 OtaStatusCode.USER_CANCELLED));
 assertTrue("installed app uid should not exist", Installer.iInstalledApps.length == 0);
 }
 public void testDownloadJadHttpRedirectCountExceeded()
 Log.logOut("InstallerEngineTest.testDownloadJadHttpRedirectCountExceeded begins");
 String[] args = new String[]
 {
 "install",
 "-silent",
-"-jad=http://195.134.231.83:7070/RedirectServlet/redirect?name=JBenchmark2.jad&count=6",
+"-jad=http://" + getTestServer() + "/installertest/redirect?name=HelloWorld_redirect.jad&count=6",
 };
 int result = Installer.mainWithResult(args);
 // Check result code.
 assertResult(result, Installer.ERR_GENERAL);
 // Check exception
 // Start installation which downloads a large file.
 String[] args = new String[]
 {
 "install",
 "-silent",
-"-jad=http://195.134.231.83:7070/omjserver/resources/omj/T00000900_JBenchmark2_8mb_gcf.jsp",
+"-jad=http://" + getTestServer() + "/installertest/HelloWorld_8mb.jad",
 };
 Log.log("InstallerEngineTest.testDownloadJadCancel: installation starts");
 int result = Installer.mainWithResult(args);
 Log.log("InstallerEngineTest.testDownloadJadCancel: installation returned");
 // Check result code.
 assertTrue("failed installation returns incorrect exception " +
 Installer.getExecuteException(),
 iItu.isExceptionReason
 (Installer.getExecuteException(),
 InstallerErrorMessage.INST_CANCEL,
-InstallerDetailedErrorMessage.NO_MSG,
+InstallerDetailedErrorMessage.INST_CANCEL,
 OtaStatusCode.USER_CANCELLED));
 assertTrue("installed app uid should not exist", Installer.iInstalledApps.length == 0);
 Log.log("InstallerEngineTest.testDownloadJadCancel: end");
 }
 callInstallerOk(new String[] { "list", "-storage" });
 callInstallerOk(new String[] { "list", "-otastatus" });
 callInstallerOk(new String[] { "list", "-systemproperties" });
 callInstallerOk(new String[] { "launch", "-nouid" });
 callInstallerOk(new String[] { "launch", "-uid=invaliduid" });
-callInstallerOk(new String[] { "uninstallall" });
+callInstallerOk(new String[] { "uninstallall", "-silent" });
 callInstallerOk(new String[] { "unregister" });
 callInstallerOk(new String[] { "test", "-nomainclass" });
 }
 public void testApplicationInfo()
 */
 public void testInstallAuthAndBig()
 {
 Log.logOut("InstallerEngineTest.testInstallAuthAndBig begins");
 // Do first installation with doInstallUninstall helper
-SuiteInfo suite = new SuiteInfo("DS_Snow_http_auth", "DS_Effects");
+SuiteInfo suite = new SuiteInfo("HelloWorld_http_auth", "Nokia");
 iDefaultOptions.addElement("-username=guest");
 iDefaultOptions.addElement("-password=guest");
-doInstallUninstall(suite, "http://195.134.231.83:7070/httpauth/DS_Snow_http_auth.jad", true, iDefaultOptions);
+doInstallUninstall(suite, "http://" + getTestServer() + "/installertest/httpauth/HelloWorld_http_auth.jad", true, iDefaultOptions);
 // Then start installation which downloads a large file.
 Log.log("InstallerEngineTest.testInstallAuthAndBig begin to install big app");
 String[] args = new String[]
 {
 "install",
 "-silent",
-"-jad=http://195.134.231.83:7070/omjserver/resources/omj/T00000900_JBenchmark2_8mb_gcf.jsp",
+"-jad=http://" + getTestServer() + "/installertest/HelloWorld_8mb.jad",
 };
 int result = Installer.mainWithResult(args);
 // Check result code.
 assertResult(result, Installer.ERR_NONE);
 // Check exception

branch	RCL_3
changeset 60	6c158198356e
parent 19	04becd199f91
child 83	26b2b12093af