Author: kono
Date: 2012-04-17 16:55:32 -0700 (Tue, 17 Apr 2012)
New Revision: 28873

Added:
   core3/api/trunk/io-api/src/test/resources/filterTest.txt
Modified:
   
core3/api/trunk/io-api/src/test/java/org/cytoscape/io/BasicCyFileFilterTest.java
   core3/api/trunk/io-api/src/test/java/org/cytoscape/io/CyFileFilterTest.java
Log:
fixes #865 New test cases had been added to io-api.

Modified: 
core3/api/trunk/io-api/src/test/java/org/cytoscape/io/BasicCyFileFilterTest.java
===================================================================
--- 
core3/api/trunk/io-api/src/test/java/org/cytoscape/io/BasicCyFileFilterTest.java
    2012-04-17 23:21:28 UTC (rev 28872)
+++ 
core3/api/trunk/io-api/src/test/java/org/cytoscape/io/BasicCyFileFilterTest.java
    2012-04-17 23:55:32 UTC (rev 28873)
@@ -17,6 +17,7 @@
        private static final String XML_EXT = "xml";
        private static final String XML_CONTENT_TYPE = "xml";
        private static final String LOCAL_SAMPLE_FILE = "filterTest.xml";
+       private static final String LOCAL_SAMPLE_FILE_INVALID = 
"filterTest.txt";
        
        @Mock
        private StreamUtil streamUtil;
@@ -35,9 +36,19 @@
                assertNotNull(fileLocaiton);
                validURI = fileLocaiton.toURI();
                
+               final URL fileLocaiton2 = 
this.getClass().getClassLoader().getResource(LOCAL_SAMPLE_FILE_INVALID);
+               assertNotNull(fileLocaiton2);
+               invalidURI = fileLocaiton2.toURI();
+               
                this.filter = new BasicCyFileFilter(extensions, contentTypes, 
description, category, streamUtil);
        }
        
+       @Test
+       public void testConstructor() {
+               this.filter = new BasicCyFileFilter(new String[] {"xml"}, new 
String[] {}, LOCAL_SAMPLE_FILE, category, streamUtil);
+               assertNotNull(filter);
+       }
+       
        @Test @Override
        public void testAcceptsInputStreamDataCategory() throws Exception {
                assertNotNull(validURI);
@@ -49,4 +60,10 @@
                assertEquals(description + " (*.xml)", filter.getDescription());
        }
        
+       @Test
+       public void testGetHeader() throws Exception {
+               String header = ((BasicCyFileFilter) 
filter).getHeader(validURI.toURL().openStream(),10);
+               assertNotNull(header);
+               assertTrue(header.contains("xml version="));
+       }
 }

Modified: 
core3/api/trunk/io-api/src/test/java/org/cytoscape/io/CyFileFilterTest.java
===================================================================
--- core3/api/trunk/io-api/src/test/java/org/cytoscape/io/CyFileFilterTest.java 
2012-04-17 23:21:28 UTC (rev 28872)
+++ core3/api/trunk/io-api/src/test/java/org/cytoscape/io/CyFileFilterTest.java 
2012-04-17 23:55:32 UTC (rev 28873)
@@ -19,8 +19,10 @@
        protected Set<String> contentTypes;
        protected String description;
        protected DataCategory category;
+       protected DataCategory invalidCategory;
        
        protected URI validURI;
+       protected URI invalidURI;
 
        @Test
        public void testConstructor() throws Exception {
@@ -28,6 +30,7 @@
                assertNotNull(contentTypes);
                assertNotNull(description);
                assertNotNull(category);
+               assertNotNull(invalidCategory);
                assertNotNull(filter);
        }
        
@@ -35,12 +38,18 @@
        public void testAcceptsURIDataCategory() throws Exception{
                assertNotNull(validURI);
                assertTrue(filter.accepts(validURI, category));
+               assertFalse(filter.accepts(invalidURI, category));
+               assertFalse(filter.accepts(invalidURI, invalidCategory));
+               assertFalse(filter.accepts(validURI, invalidCategory));
        }
 
        @Test
        public void testAcceptsInputStreamDataCategory() throws Exception {
                assertNotNull(validURI);
                assertTrue(filter.accepts(validURI.toURL().openStream(), 
category));
+               assertFalse(filter.accepts(validURI.toURL().openStream(), 
invalidCategory));
+               assertFalse(filter.accepts(invalidURI.toURL().openStream(), 
category));
+               assertFalse(filter.accepts(invalidURI.toURL().openStream(), 
invalidCategory));
        }
 
        @Test

Added: core3/api/trunk/io-api/src/test/resources/filterTest.txt
===================================================================
--- core3/api/trunk/io-api/src/test/resources/filterTest.txt                    
        (rev 0)
+++ core3/api/trunk/io-api/src/test/resources/filterTest.txt    2012-04-17 
23:55:32 UTC (rev 28873)
@@ -0,0 +1 @@
+invalid text file
\ No newline at end of file

-- 
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.

Reply via email to