svn commit: r1460685 - in /camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl: RichTestUri.scala STransformTest.scala

[ningjiang]

Author: ningjiang
Date: Mon Mar 25 14:43:06 2013
New Revision: 1460685

URL: http://svn.apache.org/r1460685
Log:
CAMEL-6208 RichTestUri supports the template requestBody

Added:
    
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformTest.scala
      - copied, changed from r1460543, 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
Modified:
    
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala

Modified: 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala?rev=1460685&r1=1460684&r2=1460685&view=diff
==============================================================================
--- 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
 Mon Mar 25 14:43:06 2013
@@ -18,6 +18,8 @@ package org.apache.camel
 package scala.dsl
 
 import org.apache.camel.component.mock.MockEndpoint
+import org.apache.camel.scala.ScalaProcessor
+import org.apache.camel.Exchange
 
 class RichTestUri(uri: String, support: ScalaTestSupport) {
 
@@ -30,6 +32,13 @@ class RichTestUri(uri: String, support: 
     }
   }
 
+  def !?(message: Any) = {
+    message match {
+      case fn : (Exchange => Unit) => support.getTemplate.request(uri, new 
ScalaProcessor(fn))
+      case body : Object => support.getTemplate.requestBody(uri, body)
+    }
+  }
+
   def expect(block: MockEndpoint => Unit) {
     val mock = support.mock(uri)
     block(mock)

Copied: 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformTest.scala
 (from r1460543, 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala)
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformTest.scala?p2=camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformTest.scala&p1=camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala&r1=1460543&r2=1460685&rev=1460685&view=diff
==============================================================================
--- 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
 (original)
+++ 
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/STransformTest.scala
 Mon Mar 25 14:43:06 2013
@@ -14,29 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel
-package scala.dsl
+package org.apache.camel.scala.dsl
 
-import org.apache.camel.component.mock.MockEndpoint
+import builder.RouteBuilder
+import org.junit.Test
+import org.scalatest.matchers.MustMatchers
 
-class RichTestUri(uri: String, support: ScalaTestSupport) {
+class STransformTest extends ScalaTestSupport with MustMatchers{
 
-  def !(messages: Any*) {
-    messages.foreach { 
-      _ match {
-        case exchange: Exchange => support.getTemplate.send(uri, exchange)
-        case anything: Any => support.getTemplate.sendBody(uri, anything)
-      }
-    }
+  @Test
+  def testRequestBody {
+    "direct:start" !? "Hello" must equal("Hello World!")
   }
 
-  def expect(block: MockEndpoint => Unit) {
-    val mock = support.mock(uri)
-    block(mock)
-  }
+  val builder =
+    new RouteBuilder {
+      //START SNIPPET: simple
+      "direct:start" transform(_.in[String] + " World!")
+      //END SNIPPET: block
+    }
 
-  def assert() {
-    support.mock(uri).assertIsSatisfied()
-  }
 
 }