Author: ruschein
Date: 2011-08-03 14:23:03 -0700 (Wed, 03 Aug 2011)
New Revision: 26368
Modified:
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyEdgeTest.java
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyNetworkTest.java
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyNodeTest.java
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/subnetwork/CyRootNetworkCyNetworkTest.java
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/subnetwork/CySubNetworkCyNetworkTest.java
Log:
Fixed fallout from converting model-api abstract tests from JUnit3 to JUnit4.
Modified:
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyEdgeTest.java
===================================================================
---
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyEdgeTest.java
2011-08-03 20:01:15 UTC (rev 26367)
+++
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyEdgeTest.java
2011-08-03 21:23:03 UTC (rev 26368)
@@ -1,14 +1,6 @@
-
/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2008, 2011, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library 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
@@ -33,26 +25,22 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
package org.cytoscape.model;
+
import org.cytoscape.model.CyNetwork;
-/**
- * DOCUMENT ME!
- */
-public class CyEdgeTest extends AbstractCyEdgeTest {
+import org.junit.After;
+import org.junit.Before;
- /**
- * DOCUMENT ME!
- */
+
+public class CyEdgeTest extends AbstractCyEdgeTest {
+ @Before
public void setUp() {
- net = TestCyNetworkFactory.getInstance();
+ net = TestCyNetworkFactory.getInstance();
}
- /**
- * DOCUMENT ME!
- */
+ @After
public void tearDown() {
net = null;
}
Modified:
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyNetworkTest.java
===================================================================
---
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyNetworkTest.java
2011-08-03 20:01:15 UTC (rev 26367)
+++
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyNetworkTest.java
2011-08-03 21:23:03 UTC (rev 26368)
@@ -1,14 +1,6 @@
-
/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2008, 2011, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library 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
@@ -33,26 +25,22 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
package org.cytoscape.model;
+
import org.cytoscape.model.CyNetwork;
-/**
- * DOCUMENT ME!
- */
-public class CyNetworkTest extends AbstractCyNetworkTest {
+import org.junit.After;
+import org.junit.Before;
- /**
- * DOCUMENT ME!
- */
+
+public class CyNetworkTest extends AbstractCyNetworkTest {
+ @Before
public void setUp() {
- net = TestCyNetworkFactory.getInstance();
+ net = TestCyNetworkFactory.getInstance();
}
- /**
- * DOCUMENT ME!
- */
+ @After
public void tearDown() {
net = null;
}
Modified:
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyNodeTest.java
===================================================================
---
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyNodeTest.java
2011-08-03 20:01:15 UTC (rev 26367)
+++
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/CyNodeTest.java
2011-08-03 21:23:03 UTC (rev 26368)
@@ -1,14 +1,6 @@
-
/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2008, 2011, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library 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
@@ -33,26 +25,22 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
package org.cytoscape.model;
+
import org.cytoscape.model.CyNetwork;
-/**
- * DOCUMENT ME!
- */
-public class CyNodeTest extends AbstractCyNodeTest {
+import org.junit.After;
+import org.junit.Before;
- /**
- * DOCUMENT ME!
- */
+
+public class CyNodeTest extends AbstractCyNodeTest {
+ @Before
public void setUp() {
- net = TestCyNetworkFactory.getInstance();
+ net = TestCyNetworkFactory.getInstance();
}
- /**
- * DOCUMENT ME!
- */
+ @After
public void tearDown() {
net = null;
}
Modified:
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/subnetwork/CyRootNetworkCyNetworkTest.java
===================================================================
---
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/subnetwork/CyRootNetworkCyNetworkTest.java
2011-08-03 20:01:15 UTC (rev 26367)
+++
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/subnetwork/CyRootNetworkCyNetworkTest.java
2011-08-03 21:23:03 UTC (rev 26368)
@@ -1,14 +1,6 @@
-
/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2008, 2011, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library 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
@@ -33,7 +25,6 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
package org.cytoscape.model.subnetwork;
@@ -41,21 +32,17 @@
import org.cytoscape.model.AbstractCyNetworkTest;
import org.cytoscape.model.TestCyNetworkFactory;
-/**
- * DOCUMENT ME!
- */
-public class CyRootNetworkCyNetworkTest extends AbstractCyNetworkTest {
+import org.junit.After;
+import org.junit.Before;
- /**
- * DOCUMENT ME!
- */
+
+public class CyRootNetworkCyNetworkTest extends AbstractCyNetworkTest {
+ @Before
public void setUp() {
- net = TestCyNetworkFactory.getPublicRootInstance();
+ net = TestCyNetworkFactory.getPublicRootInstance();
}
- /**
- * DOCUMENT ME!
- */
+ @After
public void tearDown() {
net = null;
}
Modified:
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/subnetwork/CySubNetworkCyNetworkTest.java
===================================================================
---
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/subnetwork/CySubNetworkCyNetworkTest.java
2011-08-03 20:01:15 UTC (rev 26367)
+++
core3/model-impl/trunk/impl/src/test/java/org/cytoscape/model/subnetwork/CySubNetworkCyNetworkTest.java
2011-08-03 21:23:03 UTC (rev 26368)
@@ -1,14 +1,6 @@
-
/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2008, 2011, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library 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
@@ -33,9 +25,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
package org.cytoscape.model.subnetwork;
+
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.AbstractCyNetworkTest;
import org.cytoscape.model.CyNode;
@@ -44,22 +36,18 @@
import java.util.List;
import java.util.ArrayList;
-/**
- * DOCUMENT ME!
- */
-public class CySubNetworkCyNetworkTest extends AbstractCyNetworkTest {
+import org.junit.After;
+import org.junit.Before;
- /**
- * DOCUMENT ME!
- */
+
+public class CySubNetworkCyNetworkTest extends AbstractCyNetworkTest {
+ @Before
public void setUp() {
- CyRootNetwork root =
TestCyNetworkFactory.getPublicRootInstance();
+ CyRootNetwork root =
TestCyNetworkFactory.getPublicRootInstance();
net = root.addSubNetwork();
}
- /**
- * DOCUMENT ME!
- */
+ @After
public void tearDown() {
net = null;
}
--
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.
