--- a
+++ b/src/test/java/org/sbaresearch/owl/JenaQueryFacadeTest.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) 2013/2014 Verein zur Foerderung der IT-Sicherheit in Oesterreich (SBA).
+ * The work has been developed in the TIMBUS Project and the above-mentioned are Members of the TIMBUS Consortium.
+ * TIMBUS is supported by the European Union under the 7th Framework Programme for research and technological
+ * development and demonstration activities (FP7/2007-2013) under grant agreement no. 269940.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including without
+ * limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTIBITLY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law or agreed to in writing, shall any Contributor be liable for damages, including
+ * any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this
+ * License or out of the use or inability to use the Work.
+ * See the License for the specific language governing permissions and limitation under the License.
+ */
+package org.sbaresearch.owl;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import org.apache.commons.io.IOUtils;
+import org.apache.jena.riot.RiotException;
+import org.junit.Test;
+import org.semanticweb.owlapi.model.OWLOntologyStorageException;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class JenaQueryFacadeTest {
+
+    private String sparqlGetAllClasses = "" +
+            "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n" +
+            "SELECT ?subject WHERE { ?subject rdfs:subClassOf ?object }";
+    private List<String> allClasses = new ArrayList<String>() {{
+        add(TestResources.ontologyBaseUrl + "#A");
+        add(TestResources.ontologyBaseUrl + "#B");
+        add(TestResources.ontologyBaseUrl + "#C");
+    }};
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testQuery_emptyQuery_shouldThrowException() throws OWLOntologyStorageException {
+        JenaQueryFacade queryFacade = createQueryFacade();
+        queryFacade.query("");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testQuery_queryIsNull_shouldThrowException() throws OWLOntologyStorageException {
+        JenaQueryFacade queryFacade = createQueryFacade();
+        queryFacade.query(null);
+    }
+
+    @Test(expected = InvalidQueryException.class)
+    public void testQuery_invalidQuery_shouldThrowException() throws OWLOntologyStorageException {
+        JenaQueryFacade queryFacade = createQueryFacade();
+        queryFacade.query("blah");
+    }
+
+    @Test
+    public void testExtractColumn_shouldReturnSpecifiedColumn() throws OWLOntologyStorageException {
+        JenaQueryFacade queryFacade = createQueryFacade();
+        List<String> actual = JenaQueryFacade.extractColumn(queryFacade.query(sparqlGetAllClasses), "subject");
+        assertThat(actual, containsInAnyOrder(allClasses.toArray()));
+    }
+
+    @Test
+    public void testRemoveInColumn_resultsContainNeedle_shouldRemoveNeedle() {
+        List<String> actual = JenaQueryFacade.removeInColumn(Arrays.asList("blah#01", "blah#02"), "blah#");
+        assertThat(actual, containsInAnyOrder("01", "02"));
+    }
+
+    @Test
+    public void testRemoveInColumn_resultsDoesNotContainNeedle_shouldNotChangeAnything() {
+        List<String> actual = JenaQueryFacade.removeInColumn(Arrays.asList("blah#01", "blah#02"), "blub#");
+        assertThat(actual, containsInAnyOrder("blah#01", "blah#02"));
+    }
+
+    @Test
+    public void testRemoveNamespace_containingNamespaces_shouldReturnFragments() {
+        List<String> actual = JenaQueryFacade.removeNamespace(Arrays.asList("blah#01", "blah#02"));
+        assertThat(actual, containsInAnyOrder("01", "02"));
+    }
+
+    @Test
+    public void testRemoveNamespace_containingFragmentsOnly_shouldNotAlterList() {
+        List<String> actual = JenaQueryFacade.removeNamespace(Arrays.asList("01", "02"));
+        assertThat(actual, containsInAnyOrder("01", "02"));
+    }
+
+    @Test
+    public void testQuery_validQuery_shouldReturnResults() throws OWLOntologyStorageException {
+        JenaQueryFacade queryFacade = createQueryFacade();
+        List<QuerySolution> actual = queryFacade.query(sparqlGetAllClasses);
+        for (QuerySolution solution : actual) {
+            assertTrue(allClasses.contains(solution.get("subject").toString()));
+        }
+        assertThat(actual.size(), is(allClasses.size()));
+    }
+
+    @Test(expected = RiotException.class)
+    public void testQuery_queryWithUndefinedPrefix_shouldThrowException() throws OWLOntologyStorageException {
+        JenaQueryFacade queryFacade = createQueryFacadeWithoutPrefix();
+        queryFacade.query(sparqlGetAllClasses);
+    }
+
+    private JenaQueryFacade createQueryFacade() {
+        return new JenaQueryFacade(createModel(TestResources.testOntology));
+    }
+
+    private JenaQueryFacade createQueryFacadeWithoutPrefix() {
+        return new JenaQueryFacade(createModel(TestResources.testOntologyWithoutPrefix));
+    }
+
+    private Model createModel(String ontology) {
+        OntModel ontologyModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+        return ontologyModel.read(IOUtils.toInputStream(ontology), TestResources.ontologyBaseUrl);
+    }
+
+}