diff -r 1f0034e370aa -r 71ad690e91f5 javauis/runtimeui_qt/tsrc.s60/javasrc/com/nokia/mj/impl/rt/ui/qt/RuntimeUiQtTests.java --- a/javauis/runtimeui_qt/tsrc.s60/javasrc/com/nokia/mj/impl/rt/ui/qt/RuntimeUiQtTests.java Fri Sep 17 16:44:34 2010 +0300 +++ b/javauis/runtimeui_qt/tsrc.s60/javasrc/com/nokia/mj/impl/rt/ui/qt/RuntimeUiQtTests.java Mon Oct 04 11:29:25 2010 +0300 @@ -106,18 +106,26 @@ boolean answerAvailable = false; // Test confirm - ConfirmData confirmData = new ConfirmData("Confirm dialog. Select Allow", new String[] {"answerOpt1", "answerOpt2", "answerOption3"}, 1); + ConfirmData confirmData = new ConfirmData("Confirm dialog. Select Allow", new String[] {"ALLOW", "de_ny", "answerOption3"}, 1); + answerAvailable = runtimeUi.confirm("MyFavouriteAplication", confirmData); + assertTrue(answerAvailable && confirmData.getAnswer() == 0); + + confirmData = new ConfirmData("Confirm dialog. Select Deny", new String[] {"SALLI", "deny", "answerOption3"}, 1); answerAvailable = runtimeUi.confirm("MyFavouriteAplication", confirmData); assertTrue(answerAvailable && confirmData.getAnswer() == 1); - confirmData = new ConfirmData("Confirm dialog. Select Deny", new String[] {"answerOpt1", "answerOpt2", "answerOption3"}, 1); - answerAvailable = runtimeUi.confirm("MyFavouriteAplication", confirmData); - assertTrue(answerAvailable && confirmData.getAnswer() == 0); - confirmData = new ConfirmData("Null Answer options", null /*Not Supported*/, 1); answerAvailable = runtimeUi.confirm("Null answer options", confirmData); assertTrue(answerAvailable); + confirmData = new ConfirmData("Empty string", new String[] {"", "y"}, 1); + answerAvailable = runtimeUi.confirm("MyFavouriteAplication", confirmData); + assertTrue(answerAvailable); + + confirmData = new ConfirmData("Long button text", new String[] {"loonglooongloongButoonTextloongloonglonng", "DENY"}, 1); + answerAvailable = runtimeUi.confirm("MyFavouriteAplication", confirmData); + assertTrue(answerAvailable); + ConfirmData nullConf = null; runtimeUi.confirm("Null Application", nullConf);