Author: jm
Date: 2010-09-27 14:12:16 -0700 (Mon, 27 Sep 2010)
New Revision: 22075
Added:
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLFileFilterTest.java
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReaderTest.java
core3/io-impl/trunk/src/test/resources/testData/gml/
core3/io-impl/trunk/src/test/resources/testData/gml/example1.gml
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
Log:
Added tests for GMLNetworkViewReader and GMLFileFilter
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
2010-09-27 20:27:01 UTC (rev 22074)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
2010-09-27 21:12:16 UTC (rev 22075)
@@ -680,7 +680,7 @@
// view.getLabel().setText("node(" + tempid + ")");
// }
- if (graphics_list != null) {
+ if (graphics_list != null && view != null) {
layoutNodeGraphics(myView, graphics_list, view);
}
Added:
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLFileFilterTest.java
===================================================================
---
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLFileFilterTest.java
(rev 0)
+++
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLFileFilterTest.java
2010-09-27 21:12:16 UTC (rev 22075)
@@ -0,0 +1,46 @@
+package org.cytoscape.io.internal.read.gml;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.cytoscape.io.CyFileFilter;
+import org.cytoscape.io.DataCategory;
+import org.cytoscape.io.internal.util.StreamUtilImpl;
+import org.junit.Before;
+import org.junit.Test;
+
+public class GMLFileFilterTest {
+ CyFileFilter filter;
+
+ @Before
+ public void setUp() {
+ Set<String> extensions = new HashSet<String>();
+ Set<String> contentTypes = new HashSet<String>();
+ String description = "GML";
+ filter = new GMLFileFilter(extensions, contentTypes,
description , DataCategory.NETWORK, new StreamUtilImpl());
+ }
+
+ @Test
+ public void testAcceptUri() throws Exception {
+ File file = new
File("src/test/resources/testData/gml/example1.gml");
+ assertTrue(filter.accept(file.toURI(), DataCategory.NETWORK));
+ }
+
+ @Test
+ public void testAcceptStream() throws Exception {
+ File file = new
File("src/test/resources/testData/gml/example1.gml");
+ assertTrue(filter.accept(new FileInputStream(file),
DataCategory.NETWORK));
+ }
+
+ @Test
+ public void testAcceptSomethingElse() throws Exception {
+ File file = new
File("src/test/resources/testData/xgmml/galFiltered.xgmml");
+ assertFalse(filter.accept(file.toURI(), DataCategory.NETWORK));
+ assertFalse(filter.accept(new FileInputStream(file),
DataCategory.NETWORK));
+ }
+}
Property changes on:
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLFileFilterTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReaderTest.java
===================================================================
---
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReaderTest.java
(rev 0)
+++
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReaderTest.java
2010-09-27 21:12:16 UTC (rev 22075)
@@ -0,0 +1,32 @@
+package org.cytoscape.io.internal.read.gml;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+import org.cytoscape.io.internal.read.AbstractNetworkViewReaderTester;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.view.model.CyNetworkView;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class GMLNetworkViewReaderTest extends AbstractNetworkViewReaderTester {
+ @Test
+ public void testLoadGml() throws Exception {
+ File file = new
File("src/test/resources/testData/gml/example1.gml");
+ GMLNetworkViewReader reader = new GMLNetworkViewReader(new
FileInputStream(file), netFactory, viewFactory);
+ reader.run(taskMonitor);
+ CyNetworkView[] networkViews = reader.getNetworkViews();
+
+ assertNotNull(networkViews);
+ assertEquals(1, networkViews.length);
+
+ CyNetworkView view = networkViews[0];
+ assertNotNull(view);
+
+ CyNetwork model = view.getModel();
+ assertNotNull(model);
+
+ assertEquals(3, model.getNodeCount());
+ assertEquals(3, model.getEdgeCount());
+ }
+}
Property changes on:
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReaderTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: core3/io-impl/trunk/src/test/resources/testData/gml/example1.gml
===================================================================
--- core3/io-impl/trunk/src/test/resources/testData/gml/example1.gml
(rev 0)
+++ core3/io-impl/trunk/src/test/resources/testData/gml/example1.gml
2010-09-27 21:12:16 UTC (rev 22075)
@@ -0,0 +1,128 @@
+Creator "yFiles"
+Version "2.7"
+graph
+[
+ hierarchic 1
+ label ""
+ directed 1
+ node
+ [
+ id 0
+ label "Node 1"
+ graphics
+ [
+ x 67.220703125
+ y 40.98076248168945
+ w 30.0
+ h 30.0
+ type "rectangle"
+ fill "#CCCCFF"
+ outline "#000000"
+ ]
+ LabelGraphics
+ [
+ text "Node 1"
+ fontSize 12
+ fontName "Dialog"
+ anchor "c"
+ ]
+ ]
+ node
+ [
+ id 1
+ label "node 2"
+ graphics
+ [
+ x 22.220703125
+ y 15.0
+ w 30.0
+ h 30.0
+ type "rectangle"
+ fill "#CCCCFF"
+ outline "#000000"
+ ]
+ LabelGraphics
+ [
+ text "node 2"
+ fontSize 12
+ fontName "Dialog"
+ anchor "c"
+ ]
+ ]
+ node
+ [
+ id 2
+ label "node 3"
+ graphics
+ [
+ x 22.220703125
+ y 66.9615249633789
+ w 30.0
+ h 30.0
+ type "rectangle"
+ fill "#CCCCFF"
+ outline "#000000"
+ ]
+ LabelGraphics
+ [
+ text "node 3"
+ fontSize 12
+ fontName "Dialog"
+ anchor "c"
+ ]
+ ]
+ edge
+ [
+ source 0
+ target 1
+ label "Edge from node 1 to node 2"
+ graphics
+ [
+ fill "#000000"
+ ]
+ LabelGraphics
+ [
+ text "Edge from node 1 to node 2"
+ fontSize 12
+ fontName "Dialog"
+ model "six_pos"
+ position "tail"
+ ]
+ ]
+ edge
+ [
+ source 1
+ target 2
+ label "Edge from node 2 to node 3"
+ graphics
+ [
+ fill "#000000"
+ ]
+ LabelGraphics
+ [
+ text "Edge from node 2 to node 3"
+ fontSize 12
+ fontName "Dialog"
+ model "six_pos"
+ position "tail"
+ ]
+ ]
+ edge
+ [
+ source 2
+ target 0
+ label "Edge from node 3 to node 1"
+ graphics
+ [
+ fill "#000000"
+ ]
+ LabelGraphics
+ [
+ text "Edge from node 3 to node 1"
+ fontSize 12
+ fontName "Dialog"
+ model "six_pos"
+ position "tail"
+ ]
+ ]
+]
--
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.
