Author: vpakan(a)redhat.com Date: 2011-11-02 04:47:25 -0400 (Wed, 02 Nov 2011) New Revision: 36129 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java Log: Fixes for JBT 3.3.0.M4 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-11-02 04:23:47 UTC (rev 36128) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-11-02 08:47:25 UTC (rev 36129) @@ -85,6 +85,7 @@ csf.upClicked(); } }); + bot.sleep(Timing.time2S()); assertVisualEditorContains(webBrowser, "INPUT", null, null, MinMaxPanesTest.TEST_PAGE_NAME); jspTextEditor.setFocus(); jspTextEditor.selectRange(4,25,0); @@ -106,7 +107,7 @@ csf.downClicked(); } }); - bot.sleep(Timing.time1S()); + bot.sleep(Timing.time2S()); assertSourceEditorContains(jspTextEditor.getText(), insertTestString, MinMaxPanesTest.TEST_PAGE_NAME); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2011-11-02 04:23:47 UTC (rev 36128) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2011-11-02 08:47:25 UTC (rev 36129) @@ -46,8 +46,8 @@ + "\t ;.df:,ee {df}df[ty]"; //$NON-NLS-1$ private final String COMPLEX_KEY_RESULT = "HELLO_Input_User_Name_Page_and" + //$NON-NLS-1$ "_some_more_text_vc_yy_ghg_l_kk_mmm_fdg_df_ee_df_df_ty"; //$NON-NLS-1$ - private final String COMPLEX_VALUE_RESULT = "!! HELLO ~ Input User, Name.Page ?" + //$NON-NLS-1$ - " and some more text @ \\# vc \\$ % yy^ &*(ghg ) _l-kk+mmm\\/fdg\\ ;.df:,ee {df}df[ty]"; //$NON-NLS-1$ + private final String COMPLEX_VALUE_RESULT = "\\r\\n!! HELLO ~ Input User, Name.Page ? \\r\\n\\r\\n and some more text " + //$NON-NLS-1$ + "\\r\\n \\r\\n @ \\# vc \\$ % yy^ &*(ghg ) _l-kk+mmm\\/fdg\\ \\t ;.df:,ee {df}df[ty]\\r\\n\\t\\t";; //$NON-NLS-1$ private boolean isUnusedDialogOpened = false; @@ -536,7 +536,7 @@ JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE, JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP); assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText); - assertText("Plain text", defValueText); //$NON-NLS-1$ + assertText("\\r\\n\\r\\nPlain text\\r\\n\\r\\n", defValueText); //$NON-NLS-1$ /* * Check that checkbox for the new file is selected */ @@ -594,7 +594,7 @@ "hello.properties"); //$NON-NLS-1$ editor2.toTextEditor().selectLine(0); String line = editor2.toTextEditor().getSelection(); - assertEquals("Created file is incorrect", "Plain_text=Plain text", line); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("Created file is incorrect", "Plain_text=\\r\\n\\r\\nPlain text\\r\\n\\r\\n", line); //$NON-NLS-1$ //$NON-NLS-2$ /* * Reopen the page, and check that the new file * for existed properties file won't be created. @@ -630,7 +630,7 @@ JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE, JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP); assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText); - assertText("Plain text", defValueText); //$NON-NLS-1$ + assertText("\\r\\n\\r\\nPlain text\\r\\n\\r\\n", defValueText); //$NON-NLS-1$ /* * Check that checkbox for the new file is selected */