Author: kono
Date: 2012-04-23 15:57:12 -0700 (Mon, 23 Apr 2012)
New Revision: 28956
Added:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/JStatusBarTest.java
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/JTreeTableTest.java
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/FileUtilImplTest.java
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/OpenBrowserImplTest.java
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JStatusBar.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JTreeTable.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/CyActivator.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/FileUtilImpl.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/OpenBrowserImpl.java
Log:
refs #875 New unit tests had been added to swing-util-api.
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JStatusBar.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JStatusBar.java
2012-04-23 22:42:44 UTC (rev 28955)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JStatusBar.java
2012-04-23 22:57:12 UTC (rev 28956)
@@ -47,6 +47,7 @@
* @CyAPI.Final.Class
*/
public final class JStatusBar extends JPanel {
+
private final static long serialVersionUID = 1202339875133611L;
/**
@@ -61,7 +62,7 @@
*
* @param text The String to set the left label to.
*/
- public void setLeftLabel(String text) {
+ public void setLeftLabel(final String text) {
leftLabel.setText(text);
}
@@ -70,7 +71,7 @@
*
* @param text The String to set the center label to.
*/
- public void setCenterLabel(String text) {
+ public void setCenterLabel(final String text) {
centerLabel.setText(text);
}
@@ -79,7 +80,7 @@
*
* @param text The String to set the right label to.
*/
- public void setRightLabel(String text) {
+ public void setRightLabel(final String text) {
rightLabel.setText(text);
}
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JTreeTable.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JTreeTable.java
2012-04-23 22:42:44 UTC (rev 28955)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JTreeTable.java
2012-04-23 22:57:12 UTC (rev 28956)
@@ -60,14 +60,14 @@
private final static Logger logger = LoggerFactory.getLogger(
JTreeTable.class );
/** A subclass of JTree. */
- protected TreeTableCellRenderer tree;
+ private TreeTableCellRenderer tree;
/**
* Creates a new JTreeTable object.
*
* @param treeTableModel The tree table model.
*/
- public JTreeTable(TreeTableModel treeTableModel) {
+ public JTreeTable(final TreeTableModel treeTableModel) {
super();
// Create the tree. It will be used as a renderer and editor.
@@ -150,9 +150,8 @@
public void updateUI() {
super.updateUI();
- if (tree != null) {
+ if (tree != null)
tree.updateUI();
- }
// Use the tree's default foreground and background colors in
the
// table.
@@ -171,6 +170,7 @@
* Returns the row being edited.
* @return the row being edited.
*/
+ @Override
public int getEditingRow() {
return (getColumnClass(editingColumn) == TreeTableModel.class)
? (-1) : editingRow;
}
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/CyActivator.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/CyActivator.java
2012-04-23 22:42:44 UTC (rev 28955)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/CyActivator.java
2012-04-23 22:57:12 UTC (rev 28956)
@@ -20,14 +20,14 @@
}
+ @Override
public void start(BundleContext bc) {
- CyProperty cytoscapePropertiesServiceRef =
getService(bc,CyProperty.class,"(cyPropertyName=cytoscape3.props)");
+ CyProperty<Properties> cytoscapePropertiesServiceRef =
getService(bc,CyProperty.class,"(cyPropertyName=cytoscape3.props)");
FileUtilImpl fileUtil = new
FileUtilImpl(cytoscapePropertiesServiceRef);
- OpenBrowserImpl openBrowser = new
OpenBrowserImpl(cytoscapePropertiesServiceRef);
+ OpenBrowserImpl openBrowser = new OpenBrowserImpl();
registerService(bc,fileUtil,FileUtil.class, new Properties());
registerService(bc,openBrowser,OpenBrowser.class, new
Properties());
}
}
-
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/FileUtilImpl.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/FileUtilImpl.java
2012-04-23 22:42:44 UTC (rev 28955)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/FileUtilImpl.java
2012-04-23 22:57:12 UTC (rev 28956)
@@ -53,10 +53,10 @@
class FileUtilImpl implements FileUtil {
+
private final Properties coreProperties;
- FileUtilImpl(final CyProperty<Properties> cyCoreProperty)
- {
+ FileUtilImpl(final CyProperty<Properties> cyCoreProperty) {
coreProperties = cyCoreProperty.getProperties();
}
@@ -65,8 +65,7 @@
*/
@Override
public File getFile(final Component parent, final String title, final
int load_save_custom,
- final Collection<FileChooserFilter> filters)
- {
+ final Collection<FileChooserFilter> filters) {
return getFile(parent, title, load_save_custom, null, null,
filters);
}
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/OpenBrowserImpl.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/OpenBrowserImpl.java
2012-04-23 22:42:44 UTC (rev 28955)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/OpenBrowserImpl.java
2012-04-23 22:57:12 UTC (rev 28956)
@@ -33,7 +33,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
+ */
//-------------------------------------------------------------------------
// $Revision: 13206 $
@@ -42,16 +42,12 @@
//-------------------------------------------------------------------------
package org.cytoscape.util.swing.internal;
-
import java.awt.Desktop;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Properties;
-import org.cytoscape.property.CyProperty;
import org.cytoscape.util.swing.OpenBrowser;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,43 +55,24 @@
private final Logger logger =
LoggerFactory.getLogger(OpenBrowserImpl.class);
- private final Properties props;
-
- private final static String UNIX_PATH = "htmlview";
- private final static String MAC_PATH = "open";
- private final static String WIN_PATH = "rundll32
url.dll,FileProtocolHandler";
-
- public OpenBrowserImpl(CyProperty<Properties> cyProps) {
- if ( cyProps == null )
- throw new NullPointerException("Properties is null");
- this.props = cyProps.getProperties();
- }
-
/**
- * Opens the specified URL in the system default web browser.
- * @param url The URL to open
+ * Opens the specified URL in the system default web browser.
+ *
* @return true if the URL opens successfully.
*/
- public boolean openURL(String url) {
-
- Desktop desktop = Desktop.getDesktop();
-
- try{
+ @Override
+ public boolean openURL(final String url) {
+ final Desktop desktop = Desktop.getDesktop();
+ try {
URI uri = new URI(url);
desktop.browse(uri);
- }catch (IOException ioe) {
-
- logger.warn("Open browser IOException",ioe);
+ } catch (IOException ioe) {
+ logger.warn("Could not open web browser: ", ioe);
return false;
-
} catch (URISyntaxException e) {
-
- logger.warn("Url conversion to URI exception", e);
+ logger.warn("This URI is invalid: " + url, e);
return false;
-
}
-
return true;
}
-
}
Added:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/JStatusBarTest.java
===================================================================
---
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/JStatusBarTest.java
(rev 0)
+++
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/JStatusBarTest.java
2012-04-23 22:57:12 UTC (rev 28956)
@@ -0,0 +1,42 @@
+package org.cytoscape.util.swing;
+
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class JStatusBarTest {
+
+ private JStatusBar statusBar;
+
+ @Before
+ public void setUp() throws Exception {
+ statusBar = new JStatusBar();
+ }
+
+
+ @Test
+ public void testJStatusBar() {
+ assertNotNull(statusBar);
+ }
+
+ @Test
+ public void testSetLeftLabel() {
+ String text = "left label";
+ statusBar.setLeftLabel(text);
+ }
+
+ @Test
+ public void testSetCenterLabel() {
+ String text = "center label";
+ statusBar.setLeftLabel(text);
+ }
+
+ @Test
+ public void testSetRightLabel() {
+ String text = "right label";
+ statusBar.setLeftLabel(text);
+ }
+
+}
Added:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/JTreeTableTest.java
===================================================================
---
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/JTreeTableTest.java
(rev 0)
+++
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/JTreeTableTest.java
2012-04-23 22:57:12 UTC (rev 28956)
@@ -0,0 +1,64 @@
+package org.cytoscape.util.swing;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.awt.Point;
+import java.awt.event.MouseEvent;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class JTreeTableTest {
+
+ JTreeTable table;
+
+ @Mock TreeTableModel model;
+ @Mock MouseEvent mouseEvent;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ table = new JTreeTable(model);
+ }
+
+
+ @Test
+ public void testUpdateUI() {
+ table.updateUI();
+ }
+
+ @Test
+ public void testSetRowHeightInt() {
+ table.setRowHeight(100);
+ assertEquals(100, table.getRowHeight());
+ }
+
+ @Test
+ public void testGetEditingRow() {
+ assertEquals(-1,table.getEditingRow());
+ }
+
+ @Test
+ public void testJTreeTable() {
+ assertNotNull(table);
+ assertTrue(table.getModel() instanceof TreeTableModelAdapter);
+ }
+
+ @Test
+ public void testGetToolTipTextMouseEvent() {
+ when(mouseEvent.getPoint()).thenReturn(new Point(10, 20));
+
+ table.setToolTipText("test");
+ assertEquals("test", table.getToolTipText(mouseEvent));
+ }
+
+ @Test
+ public void testGetTree() {
+ assertNotNull(table.getTree());
+ }
+}
Added:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/FileUtilImplTest.java
===================================================================
---
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/FileUtilImplTest.java
(rev 0)
+++
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/FileUtilImplTest.java
2012-04-23 22:57:12 UTC (rev 28956)
@@ -0,0 +1,65 @@
+package org.cytoscape.util.swing.internal;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.when;
+
+import java.util.Properties;
+
+import org.cytoscape.property.CyProperty;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class FileUtilImplTest {
+ private FileUtilImpl fileUtil;
+
+ @Mock private CyProperty<Properties> cyProperty;
+
+ private Properties props = new Properties();
+
+
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ when(cyProperty.getProperties()).thenReturn(props);
+
+ fileUtil = new FileUtilImpl(cyProperty);
+ }
+
+ @Test
+ public void testFileUtilImpl() {
+ assertNotNull(fileUtil);
+ }
+
+// @Test
+// public void
testGetFileComponentStringIntCollectionOfFileChooserFilter() {
+// Component parent = null;
+// String title = test;
+// int load_save_custom;
+// Collection<FileChooserFilter> filters;
+// fileUtil.getFile(parent, title, load_save_custom, filters);
+// }
+//
+// @Test
+// public void
testGetFileComponentStringIntStringStringCollectionOfFileChooserFilter() {
+// fail("Not yet implemented");
+// }
+//
+// @Test
+// public void
testGetFilesComponentStringIntCollectionOfFileChooserFilter() {
+// fail("Not yet implemented");
+// }
+//
+// @Test
+// public void
testGetFilesComponentStringIntStringStringCollectionOfFileChooserFilter() {
+// fail("Not yet implemented");
+// }
+//
+// @Test
+// public void
testGetFilesComponentStringIntStringStringBooleanCollectionOfFileChooserFilter()
{
+// fail("Not yet implemented");
+// }
+
+}
Added:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/OpenBrowserImplTest.java
===================================================================
---
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/OpenBrowserImplTest.java
(rev 0)
+++
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/OpenBrowserImplTest.java
2012-04-23 22:57:12 UTC (rev 28956)
@@ -0,0 +1,22 @@
+package org.cytoscape.util.swing.internal;
+
+import static org.junit.Assert.assertFalse;
+
+import org.cytoscape.util.swing.OpenBrowser;
+import org.junit.Test;
+
+public class OpenBrowserImplTest {
+
+ OpenBrowser openBrowser = new OpenBrowserImpl();
+
+
+ @Test
+ public void testOpenURL() {
+ // Invalid URL
+ assertFalse(openBrowser.openURL("123 @#$ ww ?* cyto"));
+
+ // Warning: This actually opens web browser!
+ //assertTrue(openBrowser.openURL("http://www.cytoscape.org/";));
+ }
+
+}
--
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.
