test/queryengine/test_query.rb in activerdf-1.0 vs test/queryengine/test_query.rb in activerdf-1.1

@@ -13,17 +13,13 @@
 
   def teardown
   end
 
   def test_sparql_generation
-
-    # TODO: write tests for distinct, ask
-
     query = Query.new
     query.select(:s)
     query.where(:s, RDFS::Resource.new('predicate'), '30')
-
     generated = Query2SPARQL.translate(query)
     expected = "SELECT ?s WHERE { ?s <predicate> \"30\" . }"
     assert_equal expected, generated
 
     query = Query.new
@@ -31,16 +27,18 @@
     query.where(:s, RDFS::Resource.new('foaf:age'), :a)
     query.where(:a, RDFS::Resource.new('rdf:type'), RDFS::Resource.new('xsd:int'))
     generated = Query2SPARQL.translate(query)
     expected = "SELECT ?s WHERE { ?s <foaf:age> ?a. ?a <rdf:type> <xsd:int> . }"
     assert_equal expected, generated
+	end
 
-    #		query = Query.new
-    #		query.select(:s).select(:a)
-    #		query.where(:s, 'foaf:age', :a)
-    #		generated = Query2SPARQL.translate(query)
-    #		expected = "SELECT DISTINCT ?s ?a WHERE { ?s foaf:age ?a .}"
-    #		assert_equal expected, generated
+	def test_sparql_distinct
+    query = Query.new
+    query.distinct(:s)
+    query.where(:s, RDFS::Resource.new('foaf:age'), :a)
+    generated = Query2SPARQL.translate(query)
+    expected = "SELECT DISTINCT ?s WHERE { ?s <foaf:age> ?a . }"
+    assert_equal expected, generated
   end
 
   def test_query_omnipotent
     # can define multiple select clauses at once or separately
     q1 = Query.new.select(:s,:a)