Tests, WIP

Add schema for tests
Rework initialization sequence

test/delayed_job_instrumentation/delayed_job_test.rb → test/delayed_job_instrumentation/test_delayed_job.rb

@@ -1,5 +1,12 @@
+require "#{File.dirname(__FILE__)}/../helper.rb"
+
+begin
+  require 'delayed_job'
+rescue LoadError => e
+  # framework not available  
+end
+
 module DelayedJobInstrumentation 
-  require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
 
   class LongRunningJob
     def perform
@@ -16,7 +23,7 @@ def perform
     end
   end
 
-  class DelayedJobTest < Test::Unit::TestCase
+  class TestDelayedJob < Test::Unit::TestCase
     def local_env
       NewRelic::Control.instance.local_env
     end
@@ -105,4 +112,4 @@ def test_lock_sampler
     end
 
   end
-end if defined? Delayed::Job
+end if defined? Delayed::Job and defined? SQLite3

test/helper.rb

@@ -3,7 +3,10 @@
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'newrelic_rpm'
 require 'rpm_contrib'
 
 class Test::Unit::TestCase
 end
+
+require 'schema.rb'

test/schema.rb

@@ -0,0 +1,31 @@
+# Use this file to add tables you need to do testing
+# These are created in a sqllite memory DB
+
+begin
+  require 'sqlite3'
+  require 'active_record'
+
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+  ActiveRecord::Migration.verbose = false
+
+  ActiveRecord::Schema.define do
+
+    create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority, :default => 0
+      table.integer  :attempts, :default => 0
+      table.text     :handler
+      table.string   :last_error
+      table.datetime :run_at
+      table.datetime :locked_at
+      table.string   :locked_by
+      table.datetime :failed_at
+      table.timestamps
+    end
+
+    create_table :stories, :force => true do |table|
+      table.string :text
+    end
+  end
+rescue LoadError
+  # Skip AR tests
+end

test/test_rpm_contrib.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require "#{File.dirname(__FILE__)}/helper"
 
 class TestRpmContrib < Test::Unit::TestCase
   def test_something_for_real