svn commit: r748445 - /buildr/trunk/spec/scala/tests_spec.rb

[as...@apache.org]

Author: assaf
Date: Fri Feb 27 08:59:51 2009
New Revision: 748445

URL: http://svn.apache.org/viewvc?rev=748445&view=rev
Log:
Merged conflicts.

Modified:
    buildr/trunk/spec/scala/tests_spec.rb

Modified: buildr/trunk/spec/scala/tests_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/tests_spec.rb?rev=748445&r1=748444&r2=748445&view=diff
==============================================================================
--- buildr/trunk/spec/scala/tests_spec.rb (original)
+++ buildr/trunk/spec/scala/tests_spec.rb Fri Feb 27 08:59:51 2009
@@ -244,70 +244,6 @@
     project('foo').test.failed_tests.should include('StringSpecs')
   end
       
-<<<<<<< HEAD:spec/scala/tests_spec.rb
-  it 'should set current directory' do
-    mkpath 'baz'
-    expected = File.expand_path('baz')
-    expected.gsub!('/', '\\') if expected =~ /^[A-Z]:/ # Java returns back slashed paths for windows
-    write 'baz/src/test/scala/CurrentDirectoryTestSuite.scala', <<-SCALA
-      class CurrentDirectoryTestSuite extends org.scalatest.FunSuite {
-        test("testCurrentDirectory") {
-          assert("value" === System.getenv("NAME"))
-          assert(#{expected.inspect} === new java.io.File(".").getCanonicalPath())
-        }
-      }
-    SCALA
-    define('foo').test.using :scalatest
-    project('foo').test.invoke
-    project('foo').test.passed_tests.should include('HelloWorldSpecs')
-  end
-
-  it 'should fail if specifications fail' do
-    write 'src/test/scala/StringSpecs.scala', <<-SCALA
-      import org.specs._
-      import org.specs.runner._
-      
-      object StringSpecs extends Specification {
-        "empty string" should {
-          "have a zero length" in {
-            ("".length) mustEqual(1)
-          }
-        }
-      }
-    SCALA
-    define('foo')
-    project('foo').test.invoke rescue
-    project('foo').test.failed_tests.should include('StringSpecs')
-  end
-      
-  it 'should run with ScalaCheck automatic test case generation' do
-    write 'src/test/scala/MySuite.scala', <<-SCALA
-      import org.scalatest.prop.PropSuite
-      import org.scalacheck.Arbitrary._
-      import org.scalacheck.Prop._
-      
-      class MySuite extends PropSuite {
-      
-        test("list concatenation") {
-          val x = List(1, 2, 3)
-          val y = List(4, 5, 6)
-          assert(x ::: y === List(1, 2, 3, 4, 5, 6))
-          check((a: List[Int], b: List[Int]) => a.size + b.size == (a ::: b).size)
-        }
-      
-        test(
-          "list concatenation using a test method",
-          (a: List[Int], b: List[Int]) => a.size + b.size == (a ::: b).size
-        )
-      }
-    SCALA
-    define('foo')
-    project('foo').test.invoke
-    project('foo').test.passed_tests.should include('MySuite')
-  end
-
-=======
->>>>>>> Move test around:spec/scala/tests_spec.rb
   it 'should run with ScalaCheck automatic test case generation' do
     write 'src/test/scala/MySuite.scala', <<-SCALA
       import org.scalatest.prop.PropSuite