Author: davsclaus
Date: Sat Apr 30 09:44:04 2011
New Revision: 1098091
URL: http://svn.apache.org/viewvc?rev=1098091&view=rev
Log:
Fixed scala compiler warning.
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Animal.scala
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala?rev=1098091&r1=1098090&r2=1098091&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
Sat Apr 30 09:44:04 2011
@@ -17,7 +17,7 @@
package org.apache.camel.scala.dsl;
import builder.RouteBuilder
-import org.apache.camel.scala.test.{Cat, Kitten}
+import org.apache.camel.scala.test.Cat
/**
* Test for setting the message body from the Scala DSL
@@ -41,7 +41,7 @@ class SetBodyTest extends ScalaTestSuppo
def doTestExpression(from: String, mock: String) = {
mock expect {_.received("Duchess", "Toulouse")}
test {
- from ! (new Cat("Duchess"), new Kitten("Toulouse"))
+ from ! (new Cat("Duchess"), new Cat("Toulouse"))
}
}
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala?rev=1098091&r1=1098090&r2=1098091&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
Sat Apr 30 09:44:04 2011
@@ -18,7 +18,7 @@ package org.apache.camel.scala
package dsl;
import builder.RouteBuilder
-import org.apache.camel.scala.test.{Cat, Kitten}
+import org.apache.camel.scala.test.Cat
/**
* Test for setting the message header from the Scala DSL
@@ -42,7 +42,7 @@ class SetHeaderTest extends ScalaTestSup
def doTestExpression(from: String, mock: String) = {
mock expect {_.headerReceived("genus", "felis")}
test {
- from ! (new Cat("Duchess"), new Kitten("Toulouse"))
+ from ! (new Cat("Duchess"), new Cat("Toulouse"))
}
}
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Animal.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Animal.scala?rev=1098091&r1=1098090&r2=1098091&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Animal.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Animal.scala
Sat Apr 30 09:44:04 2011
@@ -24,7 +24,5 @@ import _root_.scala.reflect.BeanProperty
abstract class Animal(@BeanProperty val name: String, @BeanProperty val genus:
String)
case class Cat(override val name: String) extends Animal(name, "felis")
-case class Kitten(override val name: String) extends Cat(name)
case class Dog(override val name: String) extends Animal(name, "canis")
-case class Puppy(override val name: String) extends Dog(name)
