updated to use msf matchers

git-svn-id: file:///home/svn/framework3/trunk@11740 4d416f70-5f16-0410-b530-b9f4589650da

test/functional/meterpreter/meterpreter_java_spec.rb

@@ -2,7 +2,6 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'test', 'lib'))
 
 require 'fileutils'
-require 'msftest'
 require 'msf/base'
 require 'meterpreter_spec_helper'
 require 'meterpreter_specs'

test/functional/meterpreter/meterpreter_php_spec.rb

@@ -2,7 +2,6 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'test', 'lib'))
 
 require 'fileutils'
-require 'msftest'
 require 'msf/base'
 require 'meterpreter_spec_helper'
 require 'meterpreter_specs'
@@ -45,8 +44,7 @@ describe "PhpMeterpreter" do
 	end
 	
 	after :all do
-		#FileUtils.rm_rf("*.jpeg")		
-		#FileUtils.rm_rf(@output_directory)
+		FileUtils.rm_rf(@output_directory)
 	end
 
 	

test/functional/meterpreter/meterpreter_spec_helper.rb

@@ -32,11 +32,9 @@ module MeterpreterSpecHelper
 				command_output.print_line("meterpreter_functional_test_end")		
 				data = hlp_file_to_string(temp_command_file)
 		
-				## Ugh, this is ghetto.
-				x = MsfTestCaseHelper.new(@debug)
-				x.complete?(data,"meterpreter_functional_test_start","meterpreter_functional_test_end").should be_true
-				x.all_successes_exist?(data, success_strings).should be_true
-				x.no_failures_exist?(data, fail_strings, fail_exception_strings ).should be_true
+				data.should contain_a_complete_test
+				data.should contain_all_successes
+				data.should contain_no_failures_except
 			end
 	
 			def hlp_file_to_string(filename)

test/functional/meterpreter/meterpreter_win32_spec.rb

@@ -2,7 +2,6 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'test', 'lib'))
 
 require 'fileutils'
-require 'msftest'
 require 'msf/base'
 require 'meterpreter_spec_helper'
 require 'meterpreter_specs'
@@ -49,11 +48,10 @@ describe "Win32Meterpreter" do
 		@session.init_ui(@input, @output)
 		
 		## Clean Up
-		#FileUtils.rm_rf(@output_directory)
+		FileUtils.rm_rf(@output_directory)
 	end
 
 	after :all do
-		FileUtils.rm_rf("*.jpeg")		
 		FileUtils.rm_rf(@output_directory)
 	end