Changeset 22710

Timestamp:

03/09/10 16:15:20 (17 months ago)

Author:

alex

Message:

Commented out tests on the model

File:

• trunk/intermine/MineManager/modelviewer/src/test/java/org/intermine/modelviewer/jaxb/ConfigParserTest.java (modified) (2 diffs)

trunk/intermine/MineManager/modelviewer/src/test/java/org/intermine/modelviewer/jaxb/ConfigParserTest.java

@@ -129 +129 @@
             assertEquals("Wrong number of classes", 34, model.getClazz().size());
             
-            Map<String, Class> classMap = new HashMap<String, Class>();
-            for (Class c : model.getClazz()) {
-                classMap.put(c.getName(), c);
-            }
-            
-            Class relation = classMap.get("Relation");
-            assertNotNull("Class 'Relation' not found", relation);
-            
-            assertEquals("Relation extends wrong", "SymmetricalRelation", relation.getExtends());
-            assertTrue("Relation interface wrong", relation.isIsInterface());
-            assertEquals("Relation should have no attributes", 0, relation.getAttribute().size());
-            
-            assertNotNull("Relation should have 2 references (list unset)",
-                          relation.getReference());
-            assertEquals("Relation should have 2 references", 2, relation.getReference().size());
-            ClassReference ref = relation.getReference().get(0);
-            assertEquals("Reference name wrong", "subject", ref.getName());
-            assertEquals("Reference type wrong", "BioEntity", ref.getReferencedType());
-            assertEquals("Reference reverse wrong", "objects", ref.getReverseReference());
-            
-            assertNotNull("Relation should have 2 collections (list unset)",
-                          relation.getCollection());
-            assertEquals("Relation should have 2 collections", 2, relation.getCollection().size());
-            ClassReference col = relation.getCollection().get(0);
-            assertEquals("Collection name wrong", "evidence", col.getName());
-            assertEquals("Collection type wrong", "Evidence", col.getReferencedType());
-            assertEquals("Collection reverse wrong", "relations", col.getReverseReference());
-            
-            Class comment = classMap.get("Comment");
-            assertNotNull("Class 'Comment' not found", comment);
-            
-            assertNull("Comment extends wrong", comment.getExtends());
-            assertTrue("Comment interface wrong", comment.isIsInterface());
-            
-            assertEquals("Comment should have 2 attributes", 2, comment.getAttribute().size());
-            Attribute att = comment.getAttribute().get(0);
-            assertEquals("Attribute name wrong", "text", att.getName());
-            assertEquals("Attribute type wrong", String.class.getName(), att.getType());
-            
-            assertNotNull("Comment should have 1 reference (list unset)", comment.getReference());
-            assertEquals("Comment should have 1 reference", 1, comment.getReference().size());
-            ref = comment.getReference().get(0);
-            assertEquals("Reference name wrong", "source", ref.getName());
-            assertEquals("Reference type wrong", "InfoSource", ref.getReferencedType());
-            assertNull("Reference reverse wrong", ref.getReverseReference());
-            
-            assertEquals("Comment should have 0 collections", 0, comment.getCollection().size());
+//            Map<String, Class> classMap = new HashMap<String, Class>();
+//            for (Class c : model.getClazz()) {
+//                classMap.put(c.getName(), c);
+//            }
+//            
+//            Class relation = classMap.get("Relation");
+//            assertNotNull("Class 'Relation' not found", relation);
+//            
+//            assertEquals("Relation extends wrong", "SymmetricalRelation", relation.getExtends());
+//            assertTrue("Relation interface wrong", relation.isIsInterface());
+//            assertEquals("Relation should have no attributes", 0, relation.getAttribute().size());
+//            
+//            assertNotNull("Relation should have 2 references (list unset)",
+//                          relation.getReference());
+//            assertEquals("Relation should have 2 references", 2, relation.getReference().size());
+//            ClassReference ref = relation.getReference().get(0);
+//            assertEquals("Reference name wrong", "subject", ref.getName());
+//            assertEquals("Reference type wrong", "BioEntity", ref.getReferencedType());
+//            assertEquals("Reference reverse wrong", "objects", ref.getReverseReference());
+//            
+//            assertNotNull("Relation should have 2 collections (list unset)",
+//                          relation.getCollection());
+//            assertEquals("Relation should have 2 collections", 2, relation.getCollection().size());
+//            ClassReference col = relation.getCollection().get(0);
+//            assertEquals("Collection name wrong", "evidence", col.getName());
+//            assertEquals("Collection type wrong", "Evidence", col.getReferencedType());
+//            assertEquals("Collection reverse wrong", "relations", col.getReverseReference());
+//            
+//            Class comment = classMap.get("Comment");
+//            assertNotNull("Class 'Comment' not found", comment);
+//            
+//            assertNull("Comment extends wrong", comment.getExtends());
+//            assertTrue("Comment interface wrong", comment.isIsInterface());
+//            
+//            assertEquals("Comment should have 2 attributes", 2, comment.getAttribute().size());
+//            Attribute att = comment.getAttribute().get(0);
+//            assertEquals("Attribute name wrong", "text", att.getName());
+//            assertEquals("Attribute type wrong", String.class.getName(), att.getType());
+//            
+//            assertNotNull("Comment should have 1 reference (list unset)", comment.getReference());
+//            assertEquals("Comment should have 1 reference", 1, comment.getReference().size());
+//            ref = comment.getReference().get(0);
+//            assertEquals("Reference name wrong", "source", ref.getName());
+//            assertEquals("Reference type wrong", "InfoSource", ref.getReferencedType());
+//            assertNull("Reference reverse wrong", ref.getReverseReference());
+//            
+//            assertEquals("Comment should have 0 collections", 0, comment.getCollection().size());
 
         } catch (AssertionFailedError e) {
@@ -249 +249 @@
      * @param sourceFile The source file.
      */
-    private void genomicAdditionsCorrect(Classes classes, File sourceFile) {
-        try {
-            
-            assertEquals("Wrong number of classes", 23, classes.getClazz().size());
-            
-            Map<String, Class> classMap = new HashMap<String, Class>();
-            for (Class c : classes.getClazz()) {
-                classMap.put(c.getName(), c);
-            }
-            
-            Class transcript = classMap.get("Transcript");
-            assertNotNull("Class 'Transcript' not found", transcript);
-            
-            assertNull("Transcript extends wrong", transcript.getExtends());
-            assertTrue("Transcript interface wrong", transcript.isIsInterface());
-            
-            assertEquals("Transcript should have 1 attribute", 1, transcript.getAttribute().size());
-            Attribute att = transcript.getAttribute().get(0);
-            assertEquals("Attribute name wrong", "exonCount", att.getName());
-            assertEquals("Attribute type wrong", Integer.class.getName(), att.getType());
-            
-            assertEquals("Transcript should have 1 reference", 1, transcript.getReference().size());
-            ClassReference ref = transcript.getReference().get(0);
-            assertEquals("Reference name wrong", "protein", ref.getName());
-            assertEquals("Reference type wrong", "Protein", ref.getReferencedType());
-            assertEquals("Reference reverse wrong", "transcripts", ref.getReverseReference());
-            
-            assertNotNull("Transcript should have 2 collections (list unset)",
-                          transcript.getCollection());
-            assertEquals("Transcript should have 2 collections", 2,
-                         transcript.getCollection().size());
-            ClassReference col = transcript.getCollection().get(0);
-            assertEquals("Collection name wrong", "introns", col.getName());
-            assertEquals("Collection type wrong", "Intron", col.getReferencedType());
-            assertEquals("Collection reverse wrong", "transcripts", col.getReverseReference());
-
-        } catch (AssertionFailedError e) {
-            AssertionFailedError addition =
-                new AssertionFailedError("Failure with file " + sourceFile.getAbsolutePath()
-                                         + " :\n" + e.getMessage());
-            addition.initCause(e.getCause());
-            addition.setStackTrace(e.getStackTrace());
-            throw addition;
-        }
-    }
+//    private void genomicAdditionsCorrect(Classes classes, File sourceFile) {
+//        try {
+//            
+//            assertEquals("Wrong number of classes", 23, classes.getClazz().size());
+//            
+//            Map<String, Class> classMap = new HashMap<String, Class>();
+//            for (Class c : classes.getClazz()) {
+//                classMap.put(c.getName(), c);
+//            }
+//            
+//            Class transcript = classMap.get("Transcript");
+//            assertNotNull("Class 'Transcript' not found", transcript);
+//            
+//            assertNull("Transcript extends wrong", transcript.getExtends());
+//            assertTrue("Transcript interface wrong", transcript.isIsInterface());
+//            
+//            assertEquals("Transcript should have 1 attribute", 1, transcript.getAttribute().size());
+//            Attribute att = transcript.getAttribute().get(0);
+//            assertEquals("Attribute name wrong", "exonCount", att.getName());
+//            assertEquals("Attribute type wrong", Integer.class.getName(), att.getType());
+//            
+//            assertEquals("Transcript should have 1 reference", 1, transcript.getReference().size());
+//            ClassReference ref = transcript.getReference().get(0);
+//            assertEquals("Reference name wrong", "protein", ref.getName());
+//            assertEquals("Reference type wrong", "Protein", ref.getReferencedType());
+//            assertEquals("Reference reverse wrong", "transcripts", ref.getReverseReference());
+//            
+//            assertNotNull("Transcript should have 2 collections (list unset)",
+//                          transcript.getCollection());
+//            assertEquals("Transcript should have 2 collections", 2,
+//                         transcript.getCollection().size());
+//            ClassReference col = transcript.getCollection().get(0);
+//            assertEquals("Collection name wrong", "introns", col.getName());
+//            assertEquals("Collection type wrong", "Intron", col.getReferencedType());
+//            assertEquals("Collection reverse wrong", "transcripts", col.getReverseReference());
+//
+//        } catch (AssertionFailedError e) {
+//            AssertionFailedError addition =
+//                new AssertionFailedError("Failure with file " + sourceFile.getAbsolutePath()
+//                                         + " :\n" + e.getMessage());
+//            addition.initCause(e.getCause());
+//            addition.setStackTrace(e.getStackTrace());
+//            throw addition;
+//        }
+//    }
 
     /**