Author: mes
Date: 2012-06-05 13:31:43 -0700 (Tue, 05 Jun 2012)
New Revision: 29465
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy263SimpleSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy270SimpleSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3LargeSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
Log:
Changed the tests to run in the Test phase rather than After. This is possible
because we're using the SynchronousTaskManager to execute everything.
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
2012-06-05 19:56:30 UTC (rev 29464)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
2012-06-05 20:31:43 UTC (rev 29465)
@@ -50,10 +50,10 @@
public void testLoadSession() throws Exception {
final TaskIterator ti =
openSessionTF.createTaskIterator(sessionFile);
tm.execute(ti);
+ confirm();
}
- @After
- public void confirm() {
+ private void confirm() {
// test overall status of current session.
checkGlobalStatus();
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy263SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy263SimpleSessionLodingTest.java
2012-06-05 19:56:30 UTC (rev 29464)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy263SimpleSessionLodingTest.java
2012-06-05 20:31:43 UTC (rev 29465)
@@ -50,10 +50,10 @@
public void testLoadSession() throws Exception {
final TaskIterator ti =
openSessionTF.createTaskIterator(sessionFile);
tm.execute(ti);
+ confirm();
}
- @After
- public void confirm() {
+ private void confirm() {
// test overall status of current session.
checkGlobalStatus();
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy270SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy270SimpleSessionLodingTest.java
2012-06-05 19:56:30 UTC (rev 29464)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy270SimpleSessionLodingTest.java
2012-06-05 20:31:43 UTC (rev 29465)
@@ -34,7 +34,7 @@
/**
- * Test for sample file in Cytoscape 2.5.2 distribution
+ * Test for sample file in Cytoscape 2.7.0 distribution
*
*/
@RunWith(JUnit4TestRunner.class)
@@ -51,10 +51,10 @@
public void testLoadSession() throws Exception {
final TaskIterator ti =
openSessionTF.createTaskIterator(sessionFile);
tm.execute(ti);
+ confirm();
}
- @After
- public void confirm() {
+ private void confirm() {
// test overall status of current session.
checkGlobalStatus();
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
2012-06-05 19:56:30 UTC (rev 29464)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
2012-06-05 20:31:43 UTC (rev 29465)
@@ -60,15 +60,13 @@
public void testLoadSession() throws Exception {
final TaskIterator ti =
openSessionTF.createTaskIterator(sessionFile);
tm.execute(ti);
-
+ confirm();
}
- @After
- public void confirm() {
+ private void confirm() {
// test overall status of current session.
checkGlobalStatus();
checkNetworks();
-
}
private void checkGlobalStatus() {
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3LargeSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3LargeSessionLodingTest.java
2012-06-05 19:56:30 UTC (rev 29464)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3LargeSessionLodingTest.java
2012-06-05 20:31:43 UTC (rev 29465)
@@ -25,18 +25,11 @@
public void testLoadSession() throws Exception {
final TaskIterator ti =
openSessionTF.createTaskIterator(sessionFile);
tm.execute(ti);
+ confirm();
}
- @After
- public void confirm() {
-
+ private void confirm() {
// test overall status of current session.
- checkGlobalStatus();
-
}
-
- private void checkGlobalStatus() {
-
- }
}
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
2012-06-05 19:56:30 UTC (rev 29464)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
2012-06-05 20:31:43 UTC (rev 29465)
@@ -44,10 +44,10 @@
public void testLoadSession() throws Exception {
final TaskIterator ti =
openSessionTF.createTaskIterator(sessionFile);
tm.execute(ti);
+ confirm();
}
- @After
- public void confirm() {
+ private void confirm() {
// test overall status of current session.
checkGlobalStatus();
--
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.
