Changeset 1061 for trunk/test

Timestamp:

Nov 3, 2010, 4:27:25 PM (13 years ago)

Author:

business@…

Message:

updated ontology tests and deleted tests for REST methods that should be removed, updated ontoCAT to 0.9.5.3

Location:

trunk/test/integration

Files:

• RestControllerTests.groovy (modified) (3 diffs)
• gscf/OntologyTests.groovy (modified) (1 diff)

trunk/test/integration/RestControllerTests.groovy

@@ -68 +68 @@
     }
 
-    void testGetStudy() {
-                login();
-
-                controller.params.studyToken = studyToken
-                controller.getStudy()
-                println controller.response.contentAsString
-    }
-
         void testGetAuthorizationLevel() {
                 login();
@@ -92 +84 @@
     }
 
-        void testGetAssay() {
-                login();
-
-                controller.params.assayToken = assayToken
-                controller.getAssay()
-                println controller.response.contentAsString
-    }
-
         void testGetSamples() {
                 login();
@@ -108 +92 @@
     }
 
-        void testGetSample() {
-                login();
-
-                controller.params.assayToken = assayToken
-                controller.params.sampleToken = sampleToken
-                controller.getSample()
-                println controller.response.contentAsString
-    }
-
 }

trunk/test/integration/gscf/OntologyTests.groovy

@@ -193 +193 @@
 
         public void testAddBioPortalOntology() {
-                def ontology = dbnp.data.Ontology.getBioPortalOntology("1005")                  
+                // Add a new ontology
+                def ontology = dbnp.data.Ontology.getBioPortalOntology("1031")
                 // Validate and save ontology
                 if (!ontology.validate()) { ontology.errors.each { println it} }
                 assert ontology.validate()
                 assert ontology.save(flush: true)
-                assert Ontology.findByNcboId(1005).name.equals(ontology.name)
+                assert Ontology.findByNcboId(1031).name.equals(ontology.name)
+
+                // Make sure that it is not possible to add an ontology twice
+                def addAgain = dbnp.data.Ontology.getBioPortalOntology("1031")
+                assert !addAgain.validate()
         }
 }