Author: rob.stryker(a)jboss.com Date: 2008-10-06 14:27:51 -0400 (Mon, 06 Oct 2008) New Revision: 10697 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/plugin.xml trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelTest.java Log: JBIDE-2849 - since the AntArchiveAction was removed (as per max telling me months ago they were pretty much unnecessary), their tests have been commented out and the extension point removed until such time as a more likely 'action' appear necessary. Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/plugin.xml =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/plugin.xml 2008-10-06 17:13:47 UTC (rev 10696) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/plugin.xml 2008-10-06 18:27:51 UTC (rev 10697) @@ -45,14 +45,6 @@ </file-association> </extension> <extension - point="org.jboss.ide.eclipse.archives.core.actionTypes"> - <actionType - class="org.jboss.ide.eclipse.archives.core.model.types.AntActionType" - id="org.jboss.ide.eclipse.archives.core.antActionType" - label="Ant Task"> - </actionType> - </extension> - <extension point="org.eclipse.core.variables.dynamicVariables"> <variable description="The project an archives node is declared in." Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java 2008-10-06 17:13:47 UTC (rev 10696) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelCreationTest.java 2008-10-06 18:27:51 UTC (rev 10697) @@ -93,14 +93,14 @@ fail(); } - public void testAddActionToModel() { - try { - createEmptyModelNode().addChild(createAction());; - } catch( ArchivesModelException ame ) { - return; - } - fail(); - } +// public void testAddActionToModel() { +// try { +// createEmptyModelNode().addChild(createAction());; +// } catch( ArchivesModelException ame ) { +// return; +// } +// fail(); +// } public void testAddArchiveToModel() { try { @@ -146,16 +146,16 @@ } } - public void testAddActionToArchive() { - try { - IArchive archive = createArchive("someName.war", "test"); - IArchiveAction action = createAction(); - archive.addChild(action); - createEmptyModelNode().addChild(archive); - } catch( ArchivesModelException ame ) { - fail(); - } - } +// public void testAddActionToArchive() { +// try { +// IArchive archive = createArchive("someName.war", "test"); +// IArchiveAction action = createAction(); +// archive.addChild(action); +// createEmptyModelNode().addChild(archive); +// } catch( ArchivesModelException ame ) { +// fail(); +// } +// } @@ -200,22 +200,22 @@ fail(); } } +// +// public void testAddActionToInnerArchive() { +// try { +// IArchive archive = createArchive("someName.war", "test"); +// IArchive archive2 = createArchive("someName.war2", "test2"); +// IArchiveAction action = createAction(); +// +// archive.addChild(archive2); +// archive2.addChild(action); +// createEmptyModelNode().addChild(archive); +// } catch( ArchivesModelException ame ) { +// return; +// } +// fail(); +// } - public void testAddActionToInnerArchive() { - try { - IArchive archive = createArchive("someName.war", "test"); - IArchive archive2 = createArchive("someName.war2", "test2"); - IArchiveAction action = createAction(); - - archive.addChild(archive2); - archive2.addChild(action); - createEmptyModelNode().addChild(archive); - } catch( ArchivesModelException ame ) { - return; - } - fail(); - } - // Add all to INNER-folder @@ -265,79 +265,79 @@ } - public void testAddActionToInnerFolder() { - try { - IArchive archive = createArchive("someName.war", "test"); - IArchiveFolder folder = createFolder("folder"); - IArchiveAction action = createAction(); - - archive.addChild(folder); - folder.addChild(action); - createEmptyModelNode().addChild(archive); - } catch( ArchivesModelException ame ) { - return; - } - fail(); - } +// public void testAddActionToInnerFolder() { +// try { +// IArchive archive = createArchive("someName.war", "test"); +// IArchiveFolder folder = createFolder("folder"); +// IArchiveAction action = createAction(); +// +// archive.addChild(folder); +// folder.addChild(action); +// createEmptyModelNode().addChild(archive); +// } catch( ArchivesModelException ame ) { +// return; +// } +// fail(); +// } +// +// // add all to action +// public void testAddArchiveToAction() { +// try { +// IArchive archive = createArchive("someName.war", "test"); +// IArchiveAction action = createAction(); +// IArchiveNode child = createArchive("someName2.war", "test2"); +// archive.addChild(action); +// action.addChild(child); +// createEmptyModelNode().addChild(archive); +// } catch( ArchivesModelException ame ) { +// return; +// } +// fail(); +// } +// +// public void testAddFolderToAction() { +// try { +// IArchive archive = createArchive("someName.war", "test"); +// IArchiveAction action = createAction(); +// IArchiveNode child = createFolder("test"); +// archive.addChild(action); +// action.addChild(child); +// createEmptyModelNode().addChild(archive); +// } catch( ArchivesModelException ame ) { +// return; +// } +// fail(); +// } +// +// public void testAddFilesetToAction() { +// try { +// IArchive archive = createArchive("someName.war", "test"); +// IArchiveAction action = createAction(); +// IArchiveNode child = createFileSet("*", "path"); +// archive.addChild(action); +// action.addChild(child); +// createEmptyModelNode().addChild(archive); +// } catch( ArchivesModelException ame ) { +// return; +// } +// fail(); +// } +// +// +// public void testAddActionToAction() { +// try { +// IArchive archive = createArchive("someName.war", "test"); +// IArchiveAction action = createAction(); +// IArchiveNode child = createAction(); +// archive.addChild(action); +// action.addChild(child); +// createEmptyModelNode().addChild(archive); +// } catch( ArchivesModelException ame ) { +// return; +// } +// fail(); +// } - // add all to action - public void testAddArchiveToAction() { - try { - IArchive archive = createArchive("someName.war", "test"); - IArchiveAction action = createAction(); - IArchiveNode child = createArchive("someName2.war", "test2"); - archive.addChild(action); - action.addChild(child); - createEmptyModelNode().addChild(archive); - } catch( ArchivesModelException ame ) { - return; - } - fail(); - } - - public void testAddFolderToAction() { - try { - IArchive archive = createArchive("someName.war", "test"); - IArchiveAction action = createAction(); - IArchiveNode child = createFolder("test"); - archive.addChild(action); - action.addChild(child); - createEmptyModelNode().addChild(archive); - } catch( ArchivesModelException ame ) { - return; - } - fail(); - } - - public void testAddFilesetToAction() { - try { - IArchive archive = createArchive("someName.war", "test"); - IArchiveAction action = createAction(); - IArchiveNode child = createFileSet("*", "path"); - archive.addChild(action); - action.addChild(child); - createEmptyModelNode().addChild(archive); - } catch( ArchivesModelException ame ) { - return; - } - fail(); - } - - - public void testAddActionToAction() { - try { - IArchive archive = createArchive("someName.war", "test"); - IArchiveAction action = createAction(); - IArchiveNode child = createAction(); - archive.addChild(action); - action.addChild(child); - createEmptyModelNode().addChild(archive); - } catch( ArchivesModelException ame ) { - return; - } - fail(); - } - // add all to fileset public void testAddArchiveToFileset() { try { @@ -381,19 +381,19 @@ fail(); } - public void testAddActionToFileset() { - try { - IArchive archive = createArchive("someName.war", "test"); - IArchiveFileSet fs = createFileSet("*", "path"); - IArchiveNode child = createAction(); - archive.addChild(fs); - fs.addChild(child); - createEmptyModelNode().addChild(archive); - } catch( ArchivesModelException ame ) { - return; - } - fail(); - } +// public void testAddActionToFileset() { +// try { +// IArchive archive = createArchive("someName.war", "test"); +// IArchiveFileSet fs = createFileSet("*", "path"); +// IArchiveNode child = createAction(); +// archive.addChild(fs); +// fs.addChild(child); +// createEmptyModelNode().addChild(archive); +// } catch( ArchivesModelException ame ) { +// return; +// } +// fail(); +// } Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelTest.java =================================================================== --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelTest.java 2008-10-06 17:13:47 UTC (rev 10696) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelTest.java 2008-10-06 18:27:51 UTC (rev 10697) @@ -51,12 +51,12 @@ return fs; } - protected IArchiveAction createAction() { - IArchiveAction action = ArchiveNodeFactory.createAction(); - action.setTime(IArchiveAction.POST_BUILD); - action.setType("ant"); - return action; - } +// protected IArchiveAction createAction() { +// IArchiveAction action = ArchiveNodeFactory.createAction(); +// action.setTime(IArchiveAction.POST_BUILD); +// action.setType("ant"); +// return action; +// } protected IArchive createArchive(String name, String dest) { IArchive archive = ArchiveNodeFactory.createArchive();