Author: kono
Date: 2010-08-19 01:04:43 -0700 (Thu, 19 Aug 2010)
New Revision: 21467
Added:
core3/viewmodel-impl/trunk/src/integration/
core3/viewmodel-impl/trunk/src/integration/java/
core3/viewmodel-impl/trunk/src/integration/java/org/
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/view/
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
Removed:
core3/viewmodel-impl/trunk/src/test/java/org/cytoscape/view/model/ITViewModelImpl.java
Modified:
core3/viewmodel-impl/trunk/pom.xml
Log:
Integration tests works in this version, but code/pom needs to be optimized.
Modified: core3/viewmodel-impl/trunk/pom.xml
===================================================================
--- core3/viewmodel-impl/trunk/pom.xml 2010-08-19 03:33:09 UTC (rev 21466)
+++ core3/viewmodel-impl/trunk/pom.xml 2010-08-19 08:04:43 UTC (rev 21467)
@@ -51,10 +51,31 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+
<phase>generate-test-sources</phase>
+ <goals>
+
<goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${basedir}/src/integration/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<configuration>
+
<testSourceDirectory>${basedir}/src/integration/java</testSourceDirectory>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
<executions>
Added:
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
(rev 0)
+++
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
2010-08-19 08:04:43 UTC (rev 21467)
@@ -0,0 +1,55 @@
+package org.cytoscape.view;
+
+import java.util.jar.Manifest;
+
+import org.cytoscape.integration.AbstractIntegrationTester;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.RootVisualLexicon;
+
+/**
+ * Integration test for viewmodel-impl bundle.
+ *
+ * @author kono
+ *
+ */
+public class ITViewModelImpl extends AbstractIntegrationTester {
+
+ public ITViewModelImpl() {
+ super("org.cytoscape.viewmodel-impl",
+ new String[] {
+ "org.cytoscape, event-api,
1.0-SNAPSHOT",
+ "org.cytoscape, event-impl,
1.0-SNAPSHOT",
+ "org.cytoscape, model-api,
1.0-SNAPSHOT",
+ "org.cytoscape,
integration-test-support, 1.0-SNAPSHOT",
+ "org.cytoscape, service-util,
1.0-SNAPSHOT",
+ "org.cytoscape, viewmodel-api,
1.0-SNAPSHOT",
+ "org.cytoscape, viewmodel-impl,
1.0-SNAPSHOT", },
+ new String[] {
+ "rootVisualLexicon",
"cyNetworkViewFactory" },
+ new Class[] {
+ RootVisualLexicon.class,
CyNetworkViewFactory.class });
+ }
+
+ /**
+ * Provide correct metadata for on-the-fly bundle
+ *
+ */
+ @Override
+ protected Manifest getManifest() {
+ // let the testing framework create/load the manifest
+ Manifest mf = super.getManifest();
+
+ // add import statement
+ String original =
mf.getMainAttributes().getValue("Import-Package");
+ mf.getMainAttributes().putValue("Import-Package",
+ original + ",org.cytoscape.view.model");
+
+ for (Object key : mf.getMainAttributes().keySet()) {
+ System.out.print("############ MF KEY = " + key);
+ System.out.println(", VAL = "
+ +
mf.getMainAttributes().getValue(key.toString()));
+ }
+
+ return mf;
+ }
+}
Deleted:
core3/viewmodel-impl/trunk/src/test/java/org/cytoscape/view/model/ITViewModelImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/src/test/java/org/cytoscape/view/model/ITViewModelImpl.java
2010-08-19 03:33:09 UTC (rev 21466)
+++
core3/viewmodel-impl/trunk/src/test/java/org/cytoscape/view/model/ITViewModelImpl.java
2010-08-19 08:04:43 UTC (rev 21467)
@@ -1,28 +0,0 @@
-package org.cytoscape.view.model;
-
-import org.cytoscape.integration.AbstractIntegrationTester;
-import org.cytoscape.view.model.CyNetworkViewFactory;
-import org.cytoscape.view.model.RootVisualLexicon;
-
-/**
- * Integration test for viewmodel-impl bundle.
- *
- * @author kono
- *
- */
-public class ITViewModelImpl extends AbstractIntegrationTester {
-
- public ITViewModelImpl() {
- super( "org.cytoscape.viewmodel-impl",
- new String[] { "org.cytoscape, event-api, 1.0-SNAPSHOT",
- "org.cytoscape, event-impl, 1.0-SNAPSHOT",
- "org.cytoscape, model-api, 1.0-SNAPSHOT",
- "org.cytoscape, integration-test-support,
1.0-SNAPSHOT",
- "org.cytoscape, service-util,
1.0-SNAPSHOT",
- "org.cytoscape, viewmodel-api,
1.0-SNAPSHOT",
- "org.cytoscape, viewmodel-impl,
1.0-SNAPSHOT", },
- new String[] { "rootVisualLexicon",
"cyNetworkViewFactory" },
- new Class[] { RootVisualLexicon.class,
CyNetworkViewFactory.class }
- );
- }
-}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
