Merge pull request #62 from code4lib/get_tests_passing

Get tests passing when run locally (ActiveRecord 4.2)

Author: jrochkind

Gemfile

@@ -5,16 +5,13 @@ gemspec
 gem 'jruby-openssl', :platform => :jruby
 
 group :test do
-  gem 'activerecord', '~> 4.0.0'
+  gem 'activerecord', '~> 4.2.0'
   gem 'activerecord-jdbcsqlite3-adapter', :platform => [:jruby]
   gem 'libxml-ruby', :platform => [:ruby, :mswin]
   gem 'rake'
   gem 'yard'
   gem 'redcarpet', :platform => :ruby # For fast, Github-like Markdown
   gem 'kramdown', :platform => :jruby # For Markdown without a C compiler
-  gem 'rcov', '~> 0.9', :platform => [:ruby_18, :jruby]
   gem 'test-unit'
-  gem 'simplecov', :platform => :ruby_19
-  gem 'simplecov-rcov', :platform => :ruby_19
   gem 'sqlite3', :platform => [:ruby, :mswin]
 end

README.md

@@ -2,16 +2,16 @@ ruby-oai
 ========
 
 ruby-oai is a Open Archives Protocol for Metadata Harvesting (OAI-PMH)
-library for Ruby. [OAI-PMH](http://openarchives.org) is a somewhat 
-archaic protocol for sharing metadata between digital library repositories. 
+library for Ruby. [OAI-PMH](http://openarchives.org) is a somewhat
+archaic protocol for sharing metadata between digital library repositories.
 If you are looking to share metadata on the web you are probably better off
-using a feed format like [RSS](http://www.rssboard.org/rss-specification) or 
-[Atom](http://www.atomenabled.org/). If have to work with a backwards 
-digital repository that only offers OAI-PMH access then ruby-oai is your 
+using a feed format like [RSS](http://www.rssboard.org/rss-specification) or
+[Atom](http://www.atomenabled.org/). If have to work with a backwards
+digital repository that only offers OAI-PMH access then ruby-oai is your
 friend.
 
-The [OAI-PMH](http://openarchives.org) spec defines six verbs 
-(`Identify`, `ListIdentifiers`, `ListRecords`, 
+The [OAI-PMH](http://openarchives.org) spec defines six verbs
+(`Identify`, `ListIdentifiers`, `ListRecords`,
 `GetRecords`, `ListSets`, `ListMetadataFormat`) used for discovery and sharing of
 metadata.
 
@@ -21,15 +21,15 @@ a interactive harvesting shell.
 Client
 ------
 
-The OAI client library is used for harvesting metadata from repositories. 
+The OAI client library is used for harvesting metadata from repositories.
 For example to initiate a ListRecords request to pubmed you can:
 
 ```ruby
   require 'oai'
   client = OAI::Client.new 'http://www.pubmedcentral.gov/oai/oai.cgi', :headers => { "From" => "oai@example.com" }
   response = client.list_records
   # Get the first page of records
-  response.each do |record| 
+  response.each do |record|
     puts record.metadata
   end
   # Get the second page of records
@@ -81,6 +81,15 @@ Alternately it can be installed globally using RubyGems:
 
     $ gem install oai
 
+Running tests
+-------------
+
+Tests are with Test::Unit, in a somewhat archaic/legacy style. Test setup especially is not how we would do things today. Run all tests with:
+
+    $ bundle exec rake test
+
+There are also convenience tasks to run subsets of tests.
+
 License
 -------
 

Rakefile

@@ -14,73 +14,40 @@ require 'yard'
 
 task :default => ["test", "yard"]
 
-task :test => ["test:client", "test:provider", "test:activerecord_provider"]
+Rake::TestTask.new('test') do |t|
+  t.description = "Run all Test::Unit tests"
 
+  t.libs << ['lib', 'test/client', 'test/provider', 'test/activerecord_provider']
+
+  t.pattern = 'test/{client,provider,activerecord_provider}/tc_*.rb'
+  #t.verbose = true
+  t.warning = false
+end
+
+
+# To run just subsets of tests
 namespace :test do
   Rake::TestTask.new('client') do |t|
     t.libs << ['lib', 'test/client']
     t.pattern = 'test/client/tc_*.rb'
-    t.verbose = true
+    #t.verbose = true
+    t.warning = false
   end
 
   Rake::TestTask.new('provider') do |t|
     t.libs << ['lib', 'test/provider']
     t.pattern = 'test/provider/tc_*.rb'
-    t.verbose = true
+    #t.verbose = true
+    t.warning = false
   end
 
-  desc "Active Record base Provider Tests"
   Rake::TestTask.new('activerecord_provider') do |t|
+    t.description = "Active Record base Provider Tests"
+
     t.libs << ['lib', 'test/activerecord_provider']
     t.pattern = 'test/activerecord_provider/tc_*.rb'
-    t.verbose = true
-  end
-
-  desc 'Measures test coverage'
-  # borrowed from here: http://clarkware.com/cgi/blosxom/2007/01/05#RcovRakeTask
-  task :coverage do
-    rm_f "coverage"
-    rm_f "coverage.data"
-    if RUBY_VERSION =~ /^1.8/
-      Rake::Task['rcov:client'].invoke
-      Rake::Task['rcov:provider'].invoke
-      Rake::Task['rcov:activerecord_provider'].invoke
-    else
-      ENV['COVERAGE'] = 'true'
-      Rake::Task['test:client'].invoke
-      Rake::Task['test:provider'].invoke
-      Rake::Task['test:activerecord_provider'].invoke
-    end
-
-    system("open coverage/index.html") if (PLATFORM['darwin'] if Kernel.const_defined? :PLATFORM) || (RUBY_PLATFORM =~ /darwin/ if Kernel.const_defined? :RUBY_PLATFORM)
-  end
-
-end
-
-if RUBY_VERSION =~ /^1.8/
-  require 'rcov/rcovtask'
-  namespace :rcov do
-    Rcov::RcovTask.new do |t|
-      t.name = 'client'
-      t.libs << ['lib', 'test/client']
-      t.pattern = 'test/client/tc_*.rb'
-      t.verbose = true
-      t.rcov_opts = ['--aggregate coverage.data', '--text-summary']
-    end
-
-    Rcov::RcovTask.new('provider') do |t|
-      t.libs << ['lib', 'test/provider']
-      t.pattern = 'test/provider/tc_*.rb'
-      t.verbose = true
-      t.rcov_opts = ['--aggregate coverage.data', '--text-summary']
-    end
-
-    Rcov::RcovTask.new('activerecord_provider') do |t|
-      t.libs << ['lib', 'test/activerecord_provider']
-      t.pattern = 'test/activerecord_provider/tc_*.rb'
-      t.verbose = true
-      t.rcov_opts = ['--aggregate coverage.data', '--text-summary']
-    end
+    #t.verbose = true
+    t.warning = false
   end
 end
 

test/activerecord_provider/tc_ar_provider.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_helper_ar_provider'
 
 class ActiveRecordProviderTest < TransactionalTestCase
 

test/activerecord_provider/tc_ar_sets_provider.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_helper_ar_provider'
 
 class ActiveRecordSetProviderTest < TransactionalTestCase
 

test/activerecord_provider/tc_caching_paging_provider.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_helper_ar_provider'
 
 class CachingPagingProviderTest < TransactionalTestCase
   include REXML

test/activerecord_provider/tc_simple_paging_provider.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_helper_ar_provider'
 
 class SimpleResumptionProviderTest < TransactionalTestCase
   include REXML

test/activerecord_provider/test_helper.rb …cord_provider/test_helper_ar_provider.rbtest/activerecord_provider/test_helper.rb renamed to test/activerecord_provider/test_helper_ar_provider.rb test/activerecord_provider/test_helper.rb renamed to test/activerecord_provider/test_helper_ar_provider.rb

@@ -1,12 +1,5 @@
 require 'rubygems'
 
-if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
-  require 'simplecov'
-  require 'simplecov-rcov'
-
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start
-end
 require 'test/unit'
 require File.dirname(__FILE__) + '/config/connection'
 require File.dirname(__FILE__) + '/helpers/providers'

test/client/helpers/provider.rb

@@ -1,20 +1,20 @@
 require 'webrick'
 require File.dirname(__FILE__) + '/../../provider/models'
 
-class ComplexProvider < OAI::Provider::Base
-  repository_name 'Complex Provider'
-  repository_url 'http://localhost'
-  record_prefix 'oai:test'
-  source_model ComplexModel.new(100)
-end
 
 class ProviderServer
+  class ComplexClientProvider < OAI::Provider::Base
+    repository_name 'Complex Provider'
+    repository_url 'http://localhost'
+    record_prefix 'oai:test'
+    source_model ComplexModel.new(100)
+  end
 
   attr_reader :consumed, :server
 
   def initialize(port, mount_point)
     @consumed = []
-    @provider = ComplexProvider.new
+    @provider = ComplexClientProvider.new
     @server = WEBrick::HTTPServer.new(
       :BindAddress => '127.0.0.1',
       :Logger => WEBrick::Log.new('/dev/null'),
@@ -62,4 +62,4 @@ def server_proc
     end
   end
 
-end
+end

test/client/tc_exception.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_helper_client'
 
 class ExceptionTest < Test::Unit::TestCase
 
@@ -9,7 +9,7 @@ def test_not_found
 
   def test_xml_error
     client = OAI::Client.new 'http://www.yahoo.com'
-    begin 
+    begin
       client.identify
     rescue OAI::Exception => e
       assert_match /response not well formed XML/, e.to_s, 'xml error'
@@ -23,7 +23,7 @@ def test_oai_error
     end
   end
 
-  # must pass in options as a hash 
+  # must pass in options as a hash
   def test_parameter_error
     client = OAI::Client.new 'http://localhost:3333/oai'
     assert_raises(OAI::ArgumentException) {client.get_record('foo')}
@@ -32,5 +32,5 @@ def test_parameter_error
     assert_raises(OAI::ArgumentException) {client.list_metadata_formats('foo')}
     assert_raises(OAI::ArgumentException) {client.list_sets('foo')}
   end
-  
+
 end