Merge branch 'rdf-test' into rdf-test-mt

Author: knirirr

isatools/graphQL/queries/introspection.gql

@@ -56,7 +56,11 @@ fragment TypeRef on __Type {
                     type {
                         kind
                         name
+<<<<<<< rdf-test-mt
                        description
+=======
+                        description
+>>>>>>> rdf-test
                         ofType {name}
                        inputFields {
                             name

tests/model/test_investigation.py

@@ -96,6 +96,7 @@ def test_introspection(self):
         self.assertEqual(introspection.data["schemas"]["types"][0]["name"], "IsaQuery")
         #print("\nTOTO", introspection.data["schemas"]["types"][0]["name"])
 
+
     def test_repr(self):
         self.assertEqual(
             "isatools.model.Investigation(identifier='', "

tests/validators/test_validators.py

@@ -216,11 +216,7 @@ def test_validate_isajson_iso8601(self):
             # errors from those expected in the assertion below.
             #self.assertTrue( "Invalid JSON against ISA-JSON schemas" in report["errors"][0]["message"])
             self.assertTrue("Measurement/technology type invalid" in report["errors"][0]["message"])
-            # if 3001 not in [e["code"] for e in report["errors"]]:
-            #     self.fail(
-            #         "Validation error missing when should report error - data has incorrectly formatted ISO8601 date in "
-            #         "publicReleaseDate but not reported in validation report"
-            #     )
+
 
     def test_validate_isajson_doi(self):
         """Tests against 3002"""