Skip to content

Commit

Permalink
refs #3 Test cases updated for new cy* aspects
Browse files Browse the repository at this point in the history
  • Loading branch information
@keiono
keiono committed Aug 17, 2016
1 parent 2e9e664 commit 1fc2a03
Show file tree
Hide file tree
Showing 33 changed files with 176 additions and 174 deletions.
10 changes: 6 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@

<!-- Maven Plugin Settings -->
<junit.version>4.12</junit.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-bundle-plugin.version>2.5.4</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version>

<jackson.version>2.8.1</jackson.version>
</properties>

<groupId>org.cytoscape</groupId>
<artifactId>cx-support</artifactId>
<version>0.9.12</version>
<version>1.1.0</version>
<name>CX Support</name>
<description>CX JSON Reader and Writer for Cytoscape</description>
<packaging>bundle</packaging>
Expand Down Expand Up @@ -161,7 +163,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.7.4</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.cxio</groupId>
Expand Down
34 changes: 17 additions & 17 deletions src/test/resources/testData/10_networks.cx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
"y" : -109.0
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 162,
"view" : 162,
Expand Down Expand Up @@ -401,7 +401,7 @@
"y" : 31.0
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 165,
"view" : 165,
Expand Down Expand Up @@ -537,7 +537,7 @@
"y" : -36.19614791870117
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 168,
"view" : 168,
Expand Down Expand Up @@ -673,7 +673,7 @@
"y" : -68.43471878571648
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 171,
"view" : 171,
Expand Down Expand Up @@ -809,7 +809,7 @@
"y" : -24.197526931762695
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 174,
"view" : 174,
Expand Down Expand Up @@ -945,7 +945,7 @@
"y" : -103.48582560435533
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 177,
"view" : 177,
Expand Down Expand Up @@ -1081,7 +1081,7 @@
"y" : -152.96138281665912
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 180,
"view" : 180,
Expand Down Expand Up @@ -1217,7 +1217,7 @@
"y" : -93.3991928100586
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 183,
"view" : 183,
Expand Down Expand Up @@ -1353,7 +1353,7 @@
"y" : -125.73982238769531
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 186,
"view" : 186,
Expand Down Expand Up @@ -1489,7 +1489,7 @@
"y" : -56.0
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 189,
"view" : 189,
Expand Down Expand Up @@ -1618,7 +1618,7 @@
}
} ]
}, {
"subNetworks" : [ {
"cySubNetworks" : [ {
"@id" : 52,
"nodes" : [ 152 ],
"edges" : [ ]
Expand Down Expand Up @@ -1692,7 +1692,7 @@
"s" : 142
} ]
}, {
"networkRelations" : [ {
"cyNetworkRelations" : [ {
"p" : 52,
"c" : 162,
"r" : "view",
Expand Down Expand Up @@ -1803,7 +1803,7 @@
}, {
"consistencyGroup" : 1,
"elementCount" : 0,
"name" : "hiddenAttributes",
"name" : "cyHiddenAttributes",
"properties" : [ ],
"version" : "1.0"
}, {
Expand All @@ -1827,13 +1827,13 @@
}, {
"consistencyGroup" : 1,
"elementCount" : 30,
"name" : "visualProperties",
"name" : "cyVisualProperties",
"properties" : [ ],
"version" : "1.0"
}, {
"consistencyGroup" : 1,
"elementCount" : 10,
"name" : "subNetworks",
"name" : "cySubNetworks",
"properties" : [ ],
"version" : "1.0"
}, {
Expand All @@ -1851,7 +1851,7 @@
}, {
"consistencyGroup" : 1,
"elementCount" : 20,
"name" : "networkRelations",
"name" : "cyNetworkRelations",
"properties" : [ ],
"version" : "1.0"
} ]
Expand All @@ -1860,4 +1860,4 @@
"error" : "",
"success" : true
} ]
} ]
} ]
18 changes: 9 additions & 9 deletions src/test/resources/testData/Hox_NVC4.cx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
"d" : "boolean"
} ]
}, {
"hiddenAttributes" : [ {
"cyHiddenAttributes" : [ {
"s" : 52,
"n" : "__layoutAlgorithm",
"v" : "Edge-Weighted Force-Directed AllegroLayout"
Expand Down Expand Up @@ -2102,7 +2102,7 @@
"y" : -36.0
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 127,
"view" : 127,
Expand Down Expand Up @@ -3182,7 +3182,7 @@
}
} ]
}, {
"subNetworks" : [ {
"cySubNetworks" : [ {
"@id" : 52,
"nodes" : [ 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62 ],
"edges" : [ 126, 125, 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 97, 96, 95, 94 ]
Expand All @@ -3193,7 +3193,7 @@
"s" : 52
} ]
}, {
"networkRelations" : [ {
"cyNetworkRelations" : [ {
"p" : 52,
"c" : 127,
"r" : "view",
Expand All @@ -3214,7 +3214,7 @@
}, {
"consistencyGroup" : 1,
"elementCount" : 1,
"name" : "hiddenAttributes",
"name" : "cyHiddenAttributes",
"properties" : [ ],
"version" : "1.0"
}, {
Expand All @@ -3238,13 +3238,13 @@
}, {
"consistencyGroup" : 1,
"elementCount" : 68,
"name" : "visualProperties",
"name" : "cyVisualProperties",
"properties" : [ ],
"version" : "1.0"
}, {
"consistencyGroup" : 1,
"elementCount" : 1,
"name" : "subNetworks",
"name" : "cySubNetworks",
"properties" : [ ],
"version" : "1.0"
}, {
Expand All @@ -3262,7 +3262,7 @@
}, {
"consistencyGroup" : 1,
"elementCount" : 2,
"name" : "networkRelations",
"name" : "cyNetworkRelations",
"properties" : [ ],
"version" : "1.0"
} ]
Expand All @@ -3271,4 +3271,4 @@
"error" : "",
"success" : true
} ]
} ]
} ]
16 changes: 8 additions & 8 deletions src/test/resources/testData/c_elegans.cx
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions src/test/resources/testData/collection_1.cx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"y" : -71.0
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 94,
"view" : 94,
Expand Down Expand Up @@ -459,7 +459,7 @@
"y" : -126.0
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 99,
"view" : 99,
Expand Down Expand Up @@ -600,7 +600,7 @@
"y" : -30.0
} ]
}, {
"visualProperties" : [ {
"cyVisualProperties" : [ {
"properties_of" : "network",
"applies_to" : 107,
"view" : 107,
Expand Down Expand Up @@ -729,7 +729,7 @@
}
} ]
}, {
"subNetworks" : [ {
"cySubNetworks" : [ {
"@id" : 52,
"nodes" : [ 83, 82 ],
"edges" : [ 84 ]
Expand All @@ -754,7 +754,7 @@
"s" : 72
} ]
}, {
"networkRelations" : [ {
"cyNetworkRelations" : [ {
"p" : 52,
"c" : 94,
"r" : "view",
Expand Down Expand Up @@ -795,7 +795,7 @@
}, {
"consistencyGroup" : 1,
"elementCount" : 0,
"name" : "hiddenAttributes",
"name" : "cyHiddenAttributes",
"properties" : [ ],
"version" : "1.0"
}, {
Expand All @@ -819,13 +819,13 @@
}, {
"consistencyGroup" : 1,
"elementCount" : 11,
"name" : "visualProperties",
"name" : "cyVisualProperties",
"properties" : [ ],
"version" : "1.0"
}, {
"consistencyGroup" : 1,
"elementCount" : 3,
"name" : "subNetworks",
"name" : "cySubNetworks",
"properties" : [ ],
"version" : "1.0"
}, {
Expand All @@ -843,7 +843,7 @@
}, {
"consistencyGroup" : 1,
"elementCount" : 6,
"name" : "networkRelations",
"name" : "cyNetworkRelations",
"properties" : [ ],
"version" : "1.0"
} ]
Expand All @@ -852,4 +852,4 @@
"error" : "",
"success" : true
} ]
} ]
} ]
Loading

0 comments on commit 1fc2a03

Please sign in to comment.