Author: dmaliarevich
Date: 2009-12-24 09:23:54 -0500 (Thu, 24 Dec 2009)
New Revision: 19571
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5470, JUnit was updated.
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java 2009-12-24
13:55:51 UTC (rev 19570)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java 2009-12-24
14:23:54 UTC (rev 19571)
@@ -9,6 +9,7 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.test.dialog;
+import org.eclipse.jface.window.Window;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.vpe.editor.template.VpeAnyData;
import org.jboss.tools.vpe.editor.template.VpeEditAnyDialog;
@@ -23,7 +24,7 @@
public void testVpeEditAnyDialogOpen() throws Throwable {
/*
- * Create empty data
+ * Create empty data.
*/
VpeAnyData data = new VpeAnyData(Constants.EMPTY, Constants.EMPTY, Constants.EMPTY);
VpeEditAnyDialog dialog = new VpeEditAnyDialog(PlatformUI
@@ -33,25 +34,36 @@
/*
* Assert that window has been created.
*/
- assertEquals(0, code);
-
+ assertEquals(Window.OK, code);
dialog.close();
/*
* Check that the dialog's fields are empty.
+ * Now it's impossible to get dialog fields directly.
*/
/*
* Check the dialog with filled in data.
* Dialog should display all the fields correctly.
*/
+ data = new VpeAnyData("a", "value", "color:red;");
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ data.setName("my:tag"); //$NON-NLS-1$
+
data.setUri("http://my.uri.com/tags"); //$NON-NLS-1$
+ dialog = new VpeEditAnyDialog(PlatformUI
+ .getWorkbench().getDisplay().getActiveShell(), data);
+ dialog.setBlockOnOpen(false);
+ code = dialog.open();
+ assertEquals(Window.OK, code);
+ dialog.close();
/*
* Test the editing in the dialog if possible.
+ * Now it's impossible to get dialog fields directly.
*/
/*
* Test dialog validation.
+ * Now it's impossible to get dialog fields directly.
*/
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java 2009-12-24
13:55:51 UTC (rev 19570)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java 2009-12-24
14:23:54 UTC (rev 19571)
@@ -10,6 +10,7 @@
package org.jboss.tools.vpe.ui.test.dialog;
import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.window.Window;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.vpe.resref.core.VpeResourcesDialog;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -40,7 +41,7 @@
/*
* Assert that window has been created.
*/
- assertEquals(0, code);
+ assertEquals(Window.OK, code);
dialog.close();
}