activerdf_net7 1.6.16 → 1.7.0

data/test/federation/test_federation_manager.rb

@@ -4,10 +4,11 @@
 
 require 'test/unit'
 require 'active_rdf'
-require 'federation/federation_manager'
-require "#{File.dirname(__FILE__)}/../common"
+require "#{File.dirname(File.expand_path(__FILE__))}/../common"
 
 class TestFederationManager < Test::Unit::TestCase
+  include ActiveRDF
+
   def setup
     ConnectionPool.clear
   end
@@ -17,104 +18,103 @@ class TestFederationManager < Test::Unit::TestCase
 
   @@eyal = RDFS::Resource.new("http://activerdf.org/test/eyal")
   @@age = RDFS::Resource.new("http://activerdf.org/test/age")
-  @@age_number = RDFS::Resource.new("27")
+  @@age_number = 27
   @@eye = RDFS::Resource.new("http://activerdf.org/test/eye")
-  @@eye_value = RDFS::Resource.new("blue")
+  @@eye_value = "blue"
   @@type = RDFS::Resource.new("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
   @@person = RDFS::Resource.new("http://www.w3.org/2000/01/rdf-schema#Resource")
   @@resource = RDFS::Resource.new("http://activerdf.org/test/Person")
 
 
   def test_single_pool
-    a1 = get_adapter
-    a2 = get_adapter
+    a1 = get_primary_adapter
+    a2 = get_primary_adapter
     assert_equal a1, a2
     assert_equal a1.object_id, a2.object_id
   end
 
-  def test_class_add
-    write1 = get_write_adapter
+  def test_add
+    get_primary_write_adapter
     FederationManager.add(@@eyal, @@age, @@age_number)
 
-    age_result = Query.new.select(:o).where(@@eyal, @@age, :o).execute
-    assert "27", age_result
+    age_result = Query.new.select(:o).where(@@eyal, @@age, :o).execute(:flatten=>true)
+    assert_equal 27, age_result
   end
 
-  def test_class_add_no_write_adapter
+  def test_add_no_write_adapter
     # zero write, one read -> must raise error
     adapter = get_read_only_adapter
     assert (not adapter.writes?)
     assert_raises(ActiveRdfError) { FederationManager.add(@@eyal, @@age, @@age_number) }
   end
 
-  def test_class_add_one_write_one_read
+  def test_add_one_write_one_read
     # one write, one read
 
-    write1 = get_write_adapter
+    write1 = get_primary_write_adapter
     read1 = get_read_only_adapter
     assert_not_equal write1,read1
     assert_not_equal write1.object_id, read1.object_id
 
     FederationManager.add(@@eyal, @@age, @@age_number)
 
-    age_result = Query.new.select(:o).where(@@eyal, @@age, :o).execute
-    assert "27", age_result
+    age_result = Query.new.select(:o).where(@@eyal, @@age, :o).execute(:flatten=>true)
+    assert_equal 27, age_result
   end
 
   def test_get_different_read_and_write_adapters
-    r1 = get_adapter
-    r2 = get_different_adapter(r1)
+    r1 = get_primary_adapter
+    r2 = get_secondary_adapter
     assert_not_equal r1,r2
     assert_not_equal r1.object_id, r2.object_id
 
-    w1 = get_write_adapter
-    w2 = get_different_write_adapter(w1)
+    w1 = get_primary_write_adapter
+    w2 = get_secondary_write_adapter
     assert_not_equal w1,w2
     assert_not_equal w1.object_id, w2.object_id
   end
 
-  def test_class_add_two_write
+  def test_add_two_write
     # two write, one read, no switching
     # we need to different write adapters for this
     #
 
-    write1 = get_write_adapter
-    write2 = get_different_write_adapter(write1)
-
-    read1 = get_read_only_adapter
+    get_secondary_write_adapter
+    get_primary_write_adapter
 
     FederationManager.add(@@eyal, @@age, @@age_number)
 
-    age_result = Query.new.select(:o).where(@@eyal, @@age, :o).execute
-    assert "27", age_result
+    age_result = Query.new.select(:o).where(@@eyal, @@age, :o).execute(:flatten=>true)
+    assert_equal 27, age_result
   end
 
-  def test_class_add_two_write_switching
+  def test_add_two_write_switching
     # two write, one read, with switching
 
-    write1 = get_write_adapter
-    write2 = get_different_write_adapter(write1)
+    write1 = get_primary_write_adapter
+    write2 = get_secondary_write_adapter
+    get_read_only_adapter
 
-    read1 = get_read_only_adapter
+    ConnectionPool.write_adapter = write1
 
     FederationManager.add(@@eyal, @@age, @@age_number)
-    age_result = Query.new.select(:o).where(@@eyal, @@age, :o).execute
-    assert "27", age_result
+    age_result = Query.new.select(:o).where(@@eyal, @@age, :o).execute(:flatten=>true)
+    assert_equal 27, age_result
 
     ConnectionPool.write_adapter = write2
 
     FederationManager.add(@@eyal, @@eye, @@eye_value)
-    age_result = Query.new.select(:o).where(@@eyal, @@eye, :o).execute
-    assert "blue", age_result
+    age_result = Query.new.select(:o).where(@@eyal, @@eye, :o).execute(:flatten=>true)
+    assert_equal "blue", age_result
 
-    second_result = write2.query(Query.new.select(:o).where(@@eyal, @@eye, :o))
-    assert "blue", second_result
+    second_result = write2.execute(Query.new.select(:o).where(@@eyal, @@eye, :o))
+    assert_equal [["blue"]], second_result   # results returned as array of arrays directly from adapter
   end
 
-  # this test makes no sense without two different data sources
   def test_federated_query
-    first_adapter = get_write_adapter
-    first_adapter.load("#{File.dirname(__FILE__)}/../test_person_data.nt")
+    test_person_data = "#{File.dirname(__FILE__)}/../test_person_data.nt"
+    first_adapter = get_primary_write_adapter
+    first_adapter.load(test_person_data)
     first = Query.new.select(:s,:p,:o).where(:s,:p,:o).execute
 
     # results should not be empty, because then the test succeeds trivially
@@ -122,16 +122,16 @@ class TestFederationManager < Test::Unit::TestCase
     assert first != []
 
     ConnectionPool.clear
-    second_adapter = get_different_write_adapter(first_adapter)
-    second_adapter.load("#{File.dirname(__FILE__)}/../test_person_data.nt")
+    second_adapter = get_secondary_write_adapter
+    second_adapter.load(test_person_data)
     second = Query.new.select(:s,:p,:o).where(:s,:p,:o).execute
 
     # now we query both adapters in parallel
     ConnectionPool.clear
-    first_adapter = get_write_adapter
-    first_adapter.load("#{File.dirname(__FILE__)}/../test_person_data.nt")
-    second_adapter = get_different_write_adapter(first_adapter)
-    second_adapter.load("#{File.dirname(__FILE__)}/../test_person_data.nt")
+    first_adapter = get_primary_write_adapter
+    first_adapter.load(test_person_data)
+    second_adapter = get_secondary_write_adapter
+    second_adapter.load(test_person_data)
     both = Query.new.select(:s,:p,:o).where(:s,:p,:o).execute
     # assert both together contain twice the sum of the separate sources
     assert_equal first + second, both

data/test/objectmanager/test_literal.rb

@@ -4,49 +4,70 @@
 
 require 'test/unit'
 require 'active_rdf'
-require "#{File.dirname(__FILE__)}/../common"
 
 class TestLiteral < Test::Unit::TestCase
-  def setup
-		ConnectionPool.clear
-    @adapter = get_adapter
-  end
-
-  def teardown
-  end
-
-  def test_xsd_string
-    test = Literal.typed('test', XSD::string)
-    assert_equal '"test"^^<http://www.w3.org/2001/XMLSchema#string>', test.to_ntriple
-  end
-
   def test_automatic_conversion
-    # infer string
     test = 'test'
-    assert_equal '"test"^^<http://www.w3.org/2001/XMLSchema#string>', test.to_ntriple
+    assert_equal '"test"^^<http://www.w3.org/2001/XMLSchema#string>', test.to_literal_s
 
     # infer integer
     test = 18
-    assert_equal '"18"^^<http://www.w3.org/2001/XMLSchema#integer>', test.to_ntriple
+    assert_equal '"18"^^<http://www.w3.org/2001/XMLSchema#integer>', test.to_literal_s
+
+    # infer float
+    test = 3.1415
+    assert_equal '"3.1415"^^<http://www.w3.org/2001/XMLSchema#double>', test.to_literal_s
 
     # infer boolean
     test = true
-    assert_equal '"true"^^<http://www.w3.org/2001/XMLSchema#boolean>', test.to_ntriple
+    assert_equal '"true"^^<http://www.w3.org/2001/XMLSchema#boolean>', test.to_literal_s
+
+    # infer Time
+    test = Time.parse("Sat Nov 22 00:33:23 Z 2008").utc
+    assert_equal '"2008-11-22T00:33:23Z"^^<http://www.w3.org/2001/XMLSchema#time>', test.to_literal_s
+
+    $activerdf_without_datatype = true
+    assert_equal '"2008-11-22T00:33:23Z"', test.to_literal_s
+    $activerdf_without_datatype = false
   end
-  
+
   def test_equality
     test1 = 'test'
-    test2 = Literal.typed('test', XSD::string)  
-    assert_equal test2.to_ntriple, test1.to_ntriple
+    test2 = RDFS::Literal.typed('test', XSD::string)
+    assert_equal test2.to_literal_s, test1.to_literal_s
   end
-  
+
   def test_language_tag
     cat = 'cat'
     cat_en = LocalizedString.new('cat', '@en')
-    assert_equal '"cat"@en', cat_en.to_ntriple
-    assert_not_equal cat.to_ntriple, cat_en.to_ntriple
+    assert_equal '"cat"@en', cat_en.to_literal_s
+    assert_not_equal cat.to_literal_s, cat_en.to_literal_s
+
+    assert_equal '"dog"@en-GB', LocalizedString.new('dog', '@en-GB').to_literal_s
+    assert_equal '"dog"@en@test', LocalizedString.new('dog', '@en@test').to_literal_s
+  end
+end
+
+class TestLocalizedString < Test::Unit::TestCase
+  def setup
+    @ls_en = LocalizedString.new('localized string','@en')
+  end
+
+  def test_lang
+    assert_equal 'en', @ls_en.lang
+    assert_equal @ls_en, LocalizedString.new('localized string','en')
+  end
+
+  def test_equality
+    assert @ls_en == "localized string"
+    assert @ls_en == LocalizedString.new('localized string','en')
+    assert @ls_en != LocalizedString.new('localized string','@gb')
+  end
 
-    assert_equal '"dog"@en-GB', LocalizedString.new('dog', '@en-GB').to_ntriple
-    assert_equal '"dog"@en@test', LocalizedString.new('dog', '@en@test').to_ntriple
+  def test_to_literal_s
+    assert_equal '"localized string"@en', @ls_en.to_literal_s
+    $activerdf_without_datatype = true
+    assert_equal '"localized string"', @ls_en.to_literal_s
+    $activerdf_without_datatype = false
   end
 end

data/test/objectmanager/test_namespace.rb

@@ -8,6 +8,8 @@ require 'objectmanager/namespace'
 require "#{File.dirname(__FILE__)}/../common"
 
 class TestNamespace < Test::Unit::TestCase
+  include ActiveRDF
+
   Rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
   Rdfs = 'http://www.w3.org/2000/01/rdf-schema#'
   RdfType = RDFS::Resource.new('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')
@@ -61,7 +63,7 @@ class TestNamespace < Test::Unit::TestCase
   end
 
   def test_class_register
-    test = 'http://test.org/'
+    test = 'http://activerdf.org/test/'
     abc = RDFS::Resource.new("#{test}abc")
     Namespace.register :test, test
 

data/test/objectmanager/test_object_manager.rb

@@ -7,12 +7,7 @@ require 'active_rdf'
 require "#{File.dirname(__FILE__)}/../common"
 
 class TestObjectManager < Test::Unit::TestCase
-  def setup
-    ConnectionPool.clear
-  end
-
-  def teardown
-  end
+  include SetupAdapter
 
   def test_resource_creation
     assert_nothing_raised { RDFS::Resource.new('abc') }
@@ -29,68 +24,63 @@ class TestObjectManager < Test::Unit::TestCase
   end
 
   def test_class_construct_classes
-    adapter = get_write_adapter
-    adapter.load "#{File.dirname(__FILE__)}/../test_person_data.nt"
-
-    Namespace.register(:test, 'http://activerdf.org/test/')
-
     assert_equal RDFS::Resource.new('http://activerdf.org/test/Person'), TEST::Person
     assert_kind_of Class, TEST::Person
     assert TEST::Person.ancestors.include?(RDFS::Resource)
-    assert_instance_of TEST::Person, TEST::Person.new('')
-    assert TEST::Person.new('').respond_to?(:uri)
+    new_person = TEST::Person.new(TEST::michael)
+    assert_instance_of TEST::Person, new_person
+    assert new_person.respond_to?(:uri)
 
     assert_equal RDFS::Resource.new('http://www.w3.org/2000/01/rdf-schema#Class'), RDFS::Class
-    assert RDFS::Class.ancestors.include?(RDFS::Resource)
     assert_kind_of Class, RDFS::Class
-    assert_instance_of RDFS::Resource, RDFS::Class.new('')
-    assert RDFS::Class.new('').respond_to?(:uri)
+    assert RDFS::Class.ancestors.include?(RDFS::Resource)
+    new_class = RDFS::Class.new(TEST::klass)
+    assert_instance_of RDFS::Resource, new_class
+    assert new_class.respond_to?(:uri)
   end
 
-  def test_custom_code
-    Namespace.register(:test, 'http://activerdf.org/test/')
+  def test_invalid_resource
+    assert_raise ActiveRdfError do
+      Query.new.distinct(:o).where(TEST::Person.new(''),TEST::age,:o).execute
+    end
+  end
 
+  def test_custom_code
     TEST::Person.module_eval{ def hello; 'world'; end }
     assert_respond_to TEST::Person.new(''), :hello
     assert_equal 'world', TEST::Person.new('').hello
   end
 
   def test_class_uri
-    adapter = get_write_adapter
-    adapter.load "#{File.dirname(__FILE__)}/../test_person_data.nt"
-    Namespace.register(:test, 'http://activerdf.org/test/')
-
     assert_equal RDFS::Resource.new('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), RDF::type
     assert_equal RDF::type, RDFS::Resource.new('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')
     assert_equal TEST::Person, RDFS::Resource.new('http://activerdf.org/test/Person')
     assert_equal RDFS::Resource.new('http://activerdf.org/test/Person'), TEST::Person
   end
 
-  def test_to_xml
-    get_adapter.load "#{File.dirname(__FILE__)}/../test_person_data.nt"
-    Namespace.register(:test, 'http://activerdf.org/test/')
-
+  def test_to_xml#
+    @adapter.load "#{File.dirname(__FILE__)}/../test_person_data.nt"
     eyal = RDFS::Resource.new 'http://activerdf.org/test/eyal'
     eyal.age = 29
     assert_equal 29, eyal.age
-    snippet =
-    '<rdf:Description rdf:about="#eyal">
-    <test:age rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">29</test:age>
-    <test:eye rdf:datatype="http://www.w3.org/2001/XMLSchema#string">blue</test:eye>
-    <rdf:type rdf:resource="http://activerdf.org/test/Person"/>
-    <rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>
-    </rdf:Description>
-    </rdf:RDF>'
-    # Ignore whitespaces in comparison
-    assert eyal.to_xml.gsub!(/\s+/, '').include?(snippet.gsub!(/\s+/, ''))
-
-    require 'net/http'
-    url = 'http://librdf.org/parse'
-    uri = URI.parse(url)
-    req = Net::HTTP::Post.new(url)
-    req.set_form_data('content'=>eyal.to_xml, 'language'=>'rdfxml')
-    res = Net::HTTP.new(uri.host,uri.port).start {|http| http.request(req) }
-    result = res.body.match(/Found.*triples/)[0]
-    assert_equal "Found 4 triples", result, 'invalid XML generated (according to online parser at librdf.org'
+    xml = eyal.to_xml
+    ['<rdf:Description rdf:about="#eyal">',
+    '<test:eye xml:lang="en">blue</test:eye>',
+    '<test:email rdf:datatype="http://www.w3.org/2001/XMLSchema#string">eyal@cs.vu.nl</test:email>',
+    '<test:email rdf:datatype="http://www.w3.org/2001/XMLSchema#string">eyal.oren@deri.org</test:email>',
+    '<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Resource"/>',
+    '<rdf:type rdf:resource="http://activerdf.org/test/Person"/>',
+    '<test:age rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">29</test:age>'].each do |str|
+      assert xml.include?(str), "xml does not contain #{str}"
+    end
+
+    require 'net/http'
+    url = 'http://librdf.org/parse'
+    uri = URI.parse(url)
+    req = Net::HTTP::Post.new(url)
+    req.set_form_data('content'=>eyal.to_xml, 'language'=>'rdfxml')
+    res = Net::HTTP.new(uri.host,uri.port).start {|http| http.request(req) }
+    result = res.body.match(/Found.*triples/)[0]
+    assert_equal "Found 6 triples", result, 'invalid XML generated (according to online parser at librdf.org)'
   end
 end

data/test/objectmanager/test_ordered_set.rb

@@ -13,7 +13,7 @@ class TestOrderedSet < Test::Unit::TestCase
   def setup
     ConnectionPool.clear
     
-    adapter = get_write_adapter
+    adapter = get_primary_write_adapter
     adapter.load "#{File.dirname(__FILE__)}/../test_person_data.nt"
     adapter.load "#{File.dirname(__FILE__)}/../test_rdf_data.nt"
     ObjectManager.construct_classes