fix: HTTP EVENT ERROR management for unknown exception.

p2m2 · May 17, 2022 · 404a072 · 404a072
1 parent d658645
commit 404a072
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/jvm/src/main/scala/fr/inrae/metabohub/semantic_web/driver/Rdf4jRequestDriver.scala b/jvm/src/main/scala/fr/inrae/metabohub/semantic_web/driver/Rdf4jRequestDriver.scala
@@ -42,6 +42,7 @@ trait Rdf4jRequestDriver extends RequestDriver {
           publish(DiscoveryRequestEvent(DiscoveryStateRequestEvent.ERROR_HTTP_REQUEST))
           throw SWDiscoveryException(s"** RepositoryException **\ncon:$con\n${e.getMessage}")
         case Failure(e) =>
+          publish(DiscoveryRequestEvent(DiscoveryStateRequestEvent.ERROR_HTTP_REQUEST))
           throw SWDiscoveryException(s"** Unknown error ** \n${e.getMessage}")
        }
     }

diff --git a/shared/src/test/scala/fr/inrae/metabohub/semantic_web/SWDiscoverySubscribeEventTest.scala b/shared/src/test/scala/fr/inrae/metabohub/semantic_web/SWDiscoverySubscribeEventTest.scala
@@ -94,9 +94,18 @@ object SWDiscoverySubscribeEventTest extends TestSuite {
         .select(List("h1"))
 
       swr.commit().raw.map( _=> assert(false))
-        .recover( a => {
+        .recover( _ => {
           println(swr.currentRequestEvent)
           assert(swr.currentRequestEvent == "ERROR_HTTP_REQUEST") } )
     }
+
+    test("MalformedQueryException -  ERROR_HTTP_REQUEST") {
+      val conf : SWDiscoveryConfiguration = SWDiscoveryConfiguration.init().rdfContent("<a> <b> <c> .")
+      SWDiscovery(conf).something("a").isObjectOf("some:toto").select(List("a"))
+        .commit().raw.map( _=> assert(false))
+        .recover( a => {
+          assert(a.getMessage.contains("MalformedQueryException"))
+        })
+    }
   }
 }