database_inserter_spec.rb in wvanbergen-request-log-analyzer-1.1.1

- old
+ new

@@ -6,11 +6,11 @@
 
   TEST_DATABASE_FILE = File.dirname(__FILE__) + "/fixtures/requests.db"
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
-    log_parser = RequestLogAnalyzer::LogParser.new(spec_format)
+    log_parser = RequestLogAnalyzer::Source::LogParser.new(spec_format)
     @database_inserter = RequestLogAnalyzer::Aggregator::Database.new(log_parser, :database => TEST_DATABASE_FILE)
   end
   
   after(:each) do
     File.unlink(TEST_DATABASE_FILE) if File.exist?(TEST_DATABASE_FILE)
@@ -66,19 +66,16 @@
 
 describe RequestLogAnalyzer::Aggregator::Database, "record insertion" do
   include RequestLogAnalyzerSpecHelper  
   
   before(:each) do
-    log_parser = RequestLogAnalyzer::LogParser.new(spec_format)    
+    log_parser = RequestLogAnalyzer::Source::LogParser.new(spec_format)    
     @database_inserter = RequestLogAnalyzer::Aggregator::Database.new(log_parser, :database => TEST_DATABASE_FILE)
     @database_inserter.prepare
         
-    @incomplete_request = RequestLogAnalyzer::Request.create(spec_format, {:line_type => :first, :request_no => 564})
-    @completed_request = RequestLogAnalyzer::Request.create(spec_format, 
-                          {:line_type => :first, :request_no  => 564},
-                          {:line_type => :test, :test_capture => "awesome"},
-                          {:line_type => :test, :test_capture => "indeed"},                                                    
-                          {:line_type => :last, :request_no   => 564})    
+    @incomplete_request = spec_format.create_request( {:line_type => :first, :request_no => 564})
+    @completed_request = spec_format.create_request( {:line_type => :first, :request_no  => 564}, {:line_type => :test, :test_capture => "awesome"},
+                          {:line_type => :test, :test_capture => "indeed"}, {:line_type => :last, :request_no   => 564})    
   end
   
   after(:each) do
     File.unlink(TEST_DATABASE_FILE) if File.exist?(TEST_DATABASE_FILE)
   end 