| commit | 24213c00955958e5ac1583eee8d336193de21720 | [log] [tgz] |
|---|---|---|
| author | itrimble <itrimble> | Fri Oct 08 20:33:15 2010 +0000 |
| committer | itrimble <itrimble> | Fri Oct 08 20:33:15 2010 +0000 |
| tree | 76f8fd9b8f8ae1720abbcf56510a73063d0d17ec | |
| parent | 8d1f5fe27f6cf4f68630684d00be2eb6719c99b3 [diff] |
Additional diagnostics and attempted fix for failing facesconfig.ui tests.
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/GEMPreferencesTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/GEMPreferencesTest.java index 6b21f7d..1f96e13 100644 --- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/GEMPreferencesTest.java +++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/GEMPreferencesTest.java
@@ -69,6 +69,8 @@ GEMPreferences page = (GEMPreferences) dialog.getSelectedPage(); assertNotNull(page); // there is no much open mehtods for testing.... + + dialog.close(); } protected static Shell getShell() {
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java index 92ac81e..219a583 100644 --- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java +++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/src/org/eclipse/jst/jsf/facesconfig/ui/test/PageflowEditorTest.java
@@ -22,6 +22,7 @@ import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor; import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.AddConnectionCommand; import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.AddNodeCommand; +import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DelegatingCommandStack; import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteConnectionCommand; import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteNodeCommand; import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.ReconnectConnectionCommand; @@ -87,8 +88,9 @@ AddNodeCommand command = new AddNodeCommand(); command.setParent(getPageflow()); command.setChild(source); - editor.getDelegatingCommandStack().execute( - command); + DelegatingCommandStack stack = editor.getDelegatingCommandStack(); + assertNotNull("PageflowPage will not be added to the Pageflow, as the underlying command stack is null", stack.getCurrentCommandStack()); + stack.execute(command); return source; }