8:08 p.m.
Author: rob.stryker(a)jboss.com
Date: 2008-02-27 21:08:03 -0500 (Wed, 27 Feb 2008)
New Revision: 6615
Added:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ArchivesCoreTest.java
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/ResourceModel.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/MarshallUnmarshallTest.java
Log:
Slight API change in ArchivesCore (abstract superclass). They must now be set as the
singleton instance manually rather than assuming that role upon construction.
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-02-27
23:18:47 UTC (rev 6614)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-02-28
02:08:03 UTC (rev 6615)
@@ -23,6 +23,7 @@
archivescore-eclipse.jar
Export-Package:
de.schlichtherle.io;x-friends:="org.jboss.ide.eclipse.archives.test",
org.jboss.ide.eclipse.archives.core,
+ org.jboss.ide.eclipse.archives.core.ant,
org.jboss.ide.eclipse.archives.core.build,
org.jboss.ide.eclipse.archives.core.model,
org.jboss.ide.eclipse.archives.core.model.internal;x-friends:="org.jboss.ide.eclipse.archives.test",
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2008-02-27
23:18:47 UTC (rev 6614)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2008-02-28
02:08:03 UTC (rev 6615)
@@ -1,7 +1,5 @@
package org.jboss.ide.eclipse.archives.core;
-
-
import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.build.ModelChangeListenerWithRefresh;
@@ -21,6 +19,7 @@
public WorkspaceArchivesCore ()
{
super(WORKSPACE);
+ ArchivesCore.setInstance(this);
ArchivesModel.instance().addModelListener(new ModelChangeListenerWithRefresh());
}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-02-27
23:18:47 UTC (rev 6614)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-02-28
02:08:03 UTC (rev 6615)
@@ -42,6 +42,11 @@
return instance;
}
+ public static void setInstance(ArchivesCore instance) {
+ ArchivesCore.instance = instance;
+ }
+
+
public static final int STANDALONE = 0;
public static final int WORKSPACE = 1;
@@ -57,8 +62,6 @@
extensionManager = createExtensionManager();
preferenceManager = createPreferenceManager();
logger = createLogger();
-
- instance = this;
}
protected abstract IRuntimeVariables createVariables();
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/ResourceModel.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/ResourceModel.java 2008-02-27
23:18:47 UTC (rev 6614)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/ResourceModel.java 2008-02-28
02:08:03 UTC (rev 6615)
@@ -17,6 +17,7 @@
model = new ResourceModel();
try {
archivesCore = new AntArchivesCore();
+ ArchivesCore.setInstance(archivesCore);
} catch( LinkageError le ) {
// ignore. the archives task will figure it out later
}
Modified:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
===================================================================
---
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-02-27
23:18:47 UTC (rev 6614)
+++
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-02-28
02:08:03 UTC (rev 6615)
@@ -1,15 +1,17 @@
package org.jboss.ide.eclipse.archives.test;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.ide.eclipse.archives.test.core.ArchivesCoreTest;
import org.jboss.ide.eclipse.archives.test.util.TruezipUtilTest;
import org.jboss.ide.eclipse.archives.test.xb.MarshallUnmarshallTest;
import org.jboss.ide.eclipse.archives.test.xb.ValidationTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
public class ArchivesTestSuite extends TestSuite {
public static Test suite() {
TestSuite suite = new TestSuite("Archives Tests");
+ suite.addTestSuite(ArchivesCoreTest.class);
suite.addTestSuite(MarshallUnmarshallTest.class);
suite.addTestSuite(ValidationTest.class);
suite.addTestSuite(TruezipUtilTest.class);
Added:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ArchivesCoreTest.java
===================================================================
---
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ArchivesCoreTest.java
(rev 0)
+++
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ArchivesCoreTest.java 2008-02-28
02:08:03 UTC (rev 6615)
@@ -0,0 +1,52 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+* This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.archives.test.core;
+
+import junit.framework.TestCase;
+
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
+import org.jboss.ide.eclipse.archives.core.WorkspaceArchivesCore;
+import org.jboss.ide.eclipse.archives.core.ant.AntArchivesCore;
+
+/**
+ * This class is just going to test that upon startup
+ * of the test suite, a WorkspaceArchivesCore is in place.
+ *
+ * It will also test to make sure that if we create a new
+ * ArchivesCore, it can be set as the default so that we can
+ * properly test the ant implementation.
+ *
+ * @author rob.stryker <rob.stryker(a)redhat.com>
+ *
+ */
+public class ArchivesCoreTest extends TestCase {
+ public void testArchivesCore() {
+ ArchivesCore core = ArchivesCore.getInstance();
+ assertEquals(ArchivesCore.WORKSPACE, core.getRunType());
+ assertEquals(WorkspaceArchivesCore.class, core.getClass());
+
+ AntArchivesCore core2 = new AntArchivesCore();
+ ArchivesCore.setInstance(core2);
+
+ assertEquals(ArchivesCore.STANDALONE, ArchivesCore.getInstance().getRunType());
+ }
+}
Modified:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/MarshallUnmarshallTest.java
===================================================================
---
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/MarshallUnmarshallTest.java 2008-02-27
23:18:47 UTC (rev 6614)
+++
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/MarshallUnmarshallTest.java 2008-02-28
02:08:03 UTC (rev 6615)
@@ -18,6 +18,7 @@
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbFolder;
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackage;
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackages;
+import org.jboss.ide.eclipse.archives.core.model.internal.xb.XMLBinding.XbException;
import org.jboss.ide.eclipse.archives.test.ArchivesTest;
import org.jboss.ide.eclipse.archives.test.util.FileIOUtil;
import org.osgi.framework.Bundle;
@@ -119,8 +120,10 @@
XbPackages packsFromFile = XMLBinding.unmarshal(new
FileInputStream(tmpFolder.append("marshallTest.xml").toFile()), new
NullProgressMonitor());
assertDescriptor1Accurate(packsFromFile);
- } catch(Exception e) {
+ } catch(XbException e) {
fail(e.getMessage());
+ } catch( IOException ioe ) {
+ fail(ioe.getMessage());
}
}