activerdf_net7 1.6.16 → 1.7.0

data/activerdf-redland/test/test_redland_adapter.rb

@@ -3,240 +3,78 @@
 # License:: LGPL
 
 require 'test/unit'
-require 'rubygems'
-# require 'active_rdf'
-require 'federation/federation_manager'
-require 'queryengine/query'
+require 'tmpdir'
+require 'fileutils'
+common_test_dir = File.dirname(File.expand_path(__FILE__)) + '/../../test'
+require "#{common_test_dir}/adapters/test_writable_adapter"
+require "#{common_test_dir}/adapters/test_persistent_adapter"
+require "#{common_test_dir}/adapters/test_network_aware_adapter"
 
-class TestRedlandAdapter < Test::Unit::TestCase
-  def setup
-    ConnectionPool.clear
-  end
-
-  def teardown
-  end
-
-  def test_registration
-    adapter = ConnectionPool.add_data_source(:type => :redland)
-    assert_instance_of RedlandAdapter, adapter
-  end
-
-  #def test_redland_postgres
-  #  adapter = ConnectionPool.add(:type => :redland, :name => 'db1', :location => :postgresql,
-  #        :host => 'localhost', :database => 'redland_test',
-  #            :user => 'eyal', :password => 'lief1234')
-  #end
-
-  def test_redland_connections
-    adapter = RedlandAdapter.new({})
-    assert_instance_of RedlandAdapter, adapter
-  end
-
-  def test_simple_query
-    adapter = ConnectionPool.add_data_source(:type => :redland)
-
-    eyal = RDFS::Resource.new 'eyaloren.org'
-    age = RDFS::Resource.new 'foaf:age'
-    test = RDFS::Resource.new 'test'
-
-    adapter.add(eyal, age, test)
-    result = Query.new.distinct(:s).where(:s, :p, :o).execute(:flatten)
-
-    assert_instance_of RDFS::Resource, result
-    assert_equal 'eyaloren.org', result.uri
-  end
-
-  def test_federated_query
-    adapter1 = ConnectionPool.add_data_source(:type => :redland)
-    adapter2 = ConnectionPool.add_data_source(:type => :redland, :fake_symbol_to_get_unique_adapter => true)
-
-    eyal = RDFS::Resource.new 'eyaloren.org'
-    age = RDFS::Resource.new 'foaf:age'
-    test = RDFS::Resource.new 'test'
-    test2 = RDFS::Resource.new 'test2'
-
-    adapter1.add(eyal, age, test)
-    adapter2.add(eyal, age, test2)
-
-    # assert only one distinct subject is found (same one in both adapters)
-    assert_equal 1, Query.new.distinct(:s).where(:s, :p, :o).execute.size
-
-    # assert two distinct objects are found
-    results = Query.new.distinct(:o).where(:s, :p, :o).execute
-    assert_equal 2, results.size
-
-    results.all? {|result| assert result.instance_of?(RDFS::Resource) }
-  end
-
-  def test_query_with_block
-    adapter = ConnectionPool.add_data_source(:type => :redland)
-
-    eyal = RDFS::Resource.new 'eyaloren.org'
-    age = RDFS::Resource.new 'foaf:age'
-    test = RDFS::Resource.new 'test'
-
-    adapter.add(eyal, age, test)
-    Query.new.select(:s,:p).where(:s,:p,:o).execute do |s,p|
-      assert_equal 'eyaloren.org', s.uri
-      assert_equal 'foaf:age', p.uri
-    end
-  end
-  
-  def test_load_from_file
-    adapter = ConnectionPool.add_data_source :type => :redland
-    adapter.load("#{File.dirname(__FILE__)}/test_person_data.nt", "turtle")
-    assert_equal 28, adapter.size  
-  end
-
-  def test_remote_load
-    adapter = ConnectionPool.add_data_source :type => :redland
-    adapter.load('http://www.eyaloren.org/foaf.rdf', 'rdfxml')
-    assert_equal 9, adapter.size
-  end
-
-  def test_load_and_clear
-    adapter = ConnectionPool.add_data_source :type => :redland
-    adapter.load('http://www.eyaloren.org/foaf.rdf', 'rdfxml')
-    assert_equal 9, adapter.size
-    adapter.clear
-    assert_equal 0, adapter.size
-  end
+module TestRedlandAdapter
+  include TestWritableAdapter
+  include TestNetworkAwareAdapter
 
-  def test_close
-    adapter = ConnectionPool.add_data_source :type => :redland, :location => '/tmp/test.db'
-    adapter.load('http://www.eyaloren.org/foaf.rdf', 'rdfxml')
-    assert_equal 9, adapter.size
-    adapter.close
-    assert_equal 0, ConnectionPool.adapters.size
-  end
-
-  def test_person_data
-    ConnectionPool.add_data_source :type => :redland, :location => 'test/test-person'
-    Namespace.register(:test, 'http://activerdf.org/test/')
-
-    eyal = Namespace.lookup(:test, :eyal)
-    eye = Namespace.lookup(:test, :eye)
-    person = Namespace.lookup(:test, :Person)
-    type = Namespace.lookup(:rdf, :type)
-    resource = Namespace.lookup(:rdfs,:resource)
-
-    color = Query.new.select(:o).where(eyal, eye,:o).execute
-    assert 'blue', color
-    assert_instance_of String, color
-
-    ObjectManager.construct_classes
-    assert eyal.instance_of?(TEST::Person)
-    assert eyal.instance_of?(RDFS::Resource)
-  end
-
-  def test_federated_query
-    adapter1 = ConnectionPool.add_data_source(:type => :redland)
-    adapter2 = ConnectionPool.add_data_source(:type => :redland, :fake_symbol_to_get_unique_adapter => true)
-
-    eyal = RDFS::Resource.new 'eyaloren.org'
-    age = RDFS::Resource.new 'foaf:age'
-    test = RDFS::Resource.new 'test'
-    test2 = RDFS::Resource.new 'test2'
-
-    adapter1.add(eyal, age, test)
-    adapter2.add(eyal, age, test2)
-
-    # assert only one distinct subject is found (same one in both adapters)
-    assert_equal 1, Query.new.distinct(:s).where(:s, :p, :o).execute.size
-
-    # assert two distinct objects are found
-    results = Query.new.distinct(:o).where(:s, :p, :o).execute
-    assert_equal 2, results.size
-
-    results.all? {|result| assert result.instance_of?(RDFS::Resource) }
-  end
-
-  def test_query_with_block
-    adapter = ConnectionPool.add_data_source(:type => :redland)
-
-    eyal = RDFS::Resource.new 'eyaloren.org'
-    age = RDFS::Resource.new 'foaf:age'
-    test = RDFS::Resource.new 'test'
+  def test_sparql_query
+    @adapter.add(@@eyal, @@age, @@ageval)
 
-    adapter.add(eyal, age, test)
-    Query.new.select(:s,:p).where(:s,:p,:o).execute do |s,p|
-      assert_equal 'eyaloren.org', s.uri
-      assert_equal 'foaf:age', p.uri
-    end
-  end
-
-  def test_person_data
-    adapter = ConnectionPool.add_data_source :type => :redland
-    adapter.load("#{File.dirname(__FILE__)}/test_person_data.nt", "turtle")
-
-    Namespace.register(:test, 'http://activerdf.org/test/')
-
-    eyal = Namespace.lookup(:test, :eyal)
-    eye = Namespace.lookup(:test, :eye)
-    person = Namespace.lookup(:test, :Person)
-    type = Namespace.lookup(:rdf, :type)
-    resource = Namespace.lookup(:rdfs,:resource)
+    @adapter.flush
 
-    assert_equal 'blue', eyal.test::eye
-
-    ObjectManager.construct_classes
-    assert eyal.instance_of?(TEST::Person)
-    assert eyal.instance_of?(RDFS::Resource)
+    query = Query.new.distinct(:s).where(:s,:p,:o)
+    sparql_query = @adapter.get_query_results(query)
+    assert sparql_query.include?(TEST::eyal.uri)
   end
-  
-  def test_write_to_file_and_reload
-    require 'tmpdir'
-    location = "#{Dir.tmpdir}/redland-temp"
-    adapter = ConnectionPool.add_data_source(:type => :redland, :location => location)
-
-    eyal = RDFS::Resource.new 'eyaloren.org'
-    age = RDFS::Resource.new 'foaf:age'
-    test = RDFS::Resource.new 'test'
+end
 
-    adapter.add(eyal, age, test)
-    adapter.save 
-    
-    # flush the pool and freshly load the file we just wrote into
-    ConnectionPool.clear
-    adapter2 = ConnectionPool.add_data_source(:type => :redland, :location => location)
+class TestRedlandAdapterMemory < Test::Unit::TestCase
+  include TestRedlandAdapter
+  # not persistent
 
-    assert adapter2.object_id != adapter.object_id
-    assert_equal 1, adapter2.size
+  def setup
+    super(:type => :redland, :location => "memory")
   end
+end
 
-  def test_predicate_set
-    adapter = ConnectionPool.add_data_source(:type => :redland)
-    adapter.load("#{File.dirname(__FILE__)}/test_person_data.nt", "turtle")
-    Namespace.register(:test, 'http://activerdf.org/test/')
-    assert_equal 27, TEST::eyal.age.to_i
-    assert_equal ['27'], TEST::eyal.get_predicate(TEST::age)
-
-    TEST::eyal.set_predicate(TEST::age, [30])
-    assert_equal 30, TEST::eyal.age.to_i
-    assert_equal ['30'], TEST::eyal.get_predicate(TEST::age)
+#class TestRedlandAdapterFile < Test::Unit::TestCase
+#  include TestRedlandAdapter
+#  include TestPersistentAdapter
+#
+#  def setup
+#    super(:type => :redland, :location => @location)
+#    @location = File.join(Dir.tmpdir,"redland-temp")
+#  end
+#  def teardown
+#    FileUtils.rm Dir.glob(@location + '-*')
+#  end
+#end
+
+class TestRedlandAdapterSqlite < Test::Unit::TestCase
+  include TestRedlandAdapter
+  # not persistent
 
-    ConnectionPool.clear
-    adapter = ConnectionPool.add_data_source(:type => :redland)
-    adapter.load("#{File.dirname(__FILE__)}/test_person_data.nt", "turtle")
-    assert_equal 27, TEST::eyal.age.to_i
-    TEST::eyal.age = 30
-    assert_equal 30, TEST::eyal.age.to_i
+  def setup
+    super(:type => :redland, :location => 'sqlite')
   end
+end
 
-	def test_sparql_query
-		adapter = ConnectionPool.add_data_source :type => :redland
-
-    eyal = RDFS::Resource.new 'eyaloren.org'
-    age = RDFS::Resource.new 'foaf:age'
-    test = RDFS::Resource.new 'test'
-    adapter.add(eyal, age, test)
-
-    adapter.save 
-		query = Query.new.distinct(:s).where(:s,:p,:o)
-		results = adapter.get_query_results(query)
+#class TestRedlandAdapterMySQL < Test::Unit::TestCase
+#  include TestRedlandAdapter
+#  include TestPersistentAdapter
+#
+#  def setup
+#    super(:type => :redland, :name => 'db1', :location => 'mysql',
+#          :host => 'localhost', :database => 'redland_test',
+#          :user => '', :password => '', :new => 'yes')
+#  end
+#end
+
+#class TestRedlandAdapterPostgres < Test::Unit::TestCase
+#  include TestPersistentAdapter
+#  include TestRedlandAdapter
+#
+#  def setup
+#    super(:type => :redland, :name => 'db1', :location => 'postgresql',
+#          :host => 'localhost', :database => 'redland_test',
+#          :user => '', :password => '', :new => 'yes')
+#  end
+#end
 
-		# TODO: test if results are correct; but we do this only when redland 
-		# supports this method in release
-		assert results.include?('eyaloren.org')
-	end
-end

data/activerdf-sesame/java/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Dec 02 17:17:16 CET 2009
-build.number=137
+#Thu Feb 11 14:15:40 CET 2010
+build.number=138

data/activerdf-sesame/java/temp/manifest/MANIFEST.MF

@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.7.1
-Created-By: 1.5.0_20-141 (Apple Inc.)
+Created-By: 14.3-b01-101 (Apple Inc.)
 Built-By: daniel
-Built-Number: 136
+Built-Number: 137
 
 Name: common
 Specification-Title: Example