--- a/javauis/runtimeui_qt/tsrc.s60/javasrc/com/nokia/mj/impl/rt/ui/qt/RuntimeUiQtTests.java	Mon Oct 04 11:29:25 2010 +0300
+++ b/javauis/runtimeui_qt/tsrc.s60/javasrc/com/nokia/mj/impl/rt/ui/qt/RuntimeUiQtTests.java	Fri Oct 15 12:29:39 2010 +0300
@@ -18,7 +18,7 @@
 
 package com.nokia.mj.impl.rt.ui.qt;
 
-import com.nokia.mj.impl.installer.utils.InstallerMain;
+import com.nokia.mj.impl.rt.test.UnitTestSuiteCreator;
 import com.nokia.mj.impl.utils.exception.ExceptionBase;
 import com.nokia.mj.impl.rt.ui.qt.RuntimeUiQt;
 import com.nokia.mj.impl.rt.ui.RuntimeUi;
@@ -32,11 +32,9 @@
 /**
  * RuntimeUiQt unit tests.
  */
-public class RuntimeUiQtTests extends TestCase implements InstallerMain
+public class RuntimeUiQtTests extends TestCase implements UnitTestSuiteCreator
 {
-
-    // Begin j2meunit test framework setup
-    public void installerMain(String[] args)
+    public TestSuite createTestSuite(String[] args)
     {
         TestSuite suite = new TestSuite(this.getClass().getName());
 
@@ -48,7 +46,7 @@
             }
         }));
 
-        com.nokia.mj.impl.utils.OmjTestRunner.run(suite);
+        return suite;
     }
 
     public RuntimeUiQtTests()
@@ -103,6 +101,8 @@
             0,
             null /* no params for detailed msg */);
 
+        runtimeUi.error("MyApplication", exc);
+        
         boolean answerAvailable = false;
 
         // Test confirm
@@ -114,7 +114,7 @@
         answerAvailable = runtimeUi.confirm("MyFavouriteAplication", confirmData);
         assertTrue(answerAvailable && confirmData.getAnswer() == 1);
 
-        confirmData = new ConfirmData("Null Answer options", null /*Not Supported*/, 1);
+        confirmData = new ConfirmData("Null Answer options", null, 1);
         answerAvailable = runtimeUi.confirm("Null answer options", confirmData);
         assertTrue(answerAvailable);
 
@@ -129,6 +129,12 @@
         ConfirmData nullConf = null;
         runtimeUi.confirm("Null Application", nullConf);
 
+        // If confirm data does not contain localized texts for button names RuntimeUI populates them.
+        // Check those are localized and correct response is received.
+        confirmData = new ConfirmData("Test RuntimeUI loc working. Press allow", null, 0);
+        answerAvailable = runtimeUi.confirm("MyFavouriteAplication", confirmData);        
+        assertTrue(answerAvailable && confirmData.getAnswer() == 0);
+
         runtimeUi.destroy();
     }
 }