You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/06 17:52:01 UTC
svn commit: r1429554 - in /camel/trunk/components/camel-scala/src:
main/scala/org/apache/camel/scala/ main/scala/org/apache/camel/scala/dsl/
main/scala/org/apache/camel/scala/dsl/languages/
test/scala/org/apache/camel/scala/ test/scala/org/apache/camel...
Author: davsclaus
Date: Sun Jan 6 16:52:00 2013
New Revision: 1429554
URL: http://svn.apache.org/viewvc?rev=1429554&view=rev
Log:
Polished camel-scala with code reportings from IDEA.
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/LanguageFunction.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExchangePatternTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SValidateTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala
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/SetExchangePatternTest.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/dsl/SimpleBeanTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeHeaderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizePairTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeXMLTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/XPathContentBasedRouterTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/RouteBuilderUnwrapTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala Sun Jan 6 16:52:00 2013
@@ -22,6 +22,8 @@ package scala
*/
class ScalaProcessor(val function: Exchange => Any) extends Processor {
- def process(exchange: Exchange) = function(exchange)
+ def process(exchange: Exchange) {
+ function(exchange)
+ }
}
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala Sun Jan 6 16:52:00 2013
@@ -20,7 +20,7 @@ package dsl
import org.apache.camel.model.DataFormatDefinition
import reflect.Manifest
-import java.util.Comparator;
+import java.util.Comparator
import org.apache.camel.processor.aggregate.AggregationStrategy
import org.apache.camel.spi.Policy
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala Sun Jan 6 16:52:00 2013
@@ -94,7 +94,7 @@ abstract class SAbstractDefinition[P <:
def multicast = SMulticastDefinition(target.multicast)
def onCompletion: SOnCompletionDefinition = {
- var completion = SOnCompletionDefinition(target.onCompletion)
+ val completion = SOnCompletionDefinition(target.onCompletion)
// let's end the block in the Java DSL, we have a better way of handling blocks here
completion.target.end
completion
@@ -122,10 +122,8 @@ abstract class SAbstractDefinition[P <:
def routingSlip(header: String) = wrap(target.routingSlip(header))
@Deprecated
def routingSlip(header: String, separator: String) = wrap(target.routingSlip(header, separator))
-
- def routingSlip(expression: Exchange => Any, separator: String) = wrap(target.routingSlip(expression, separator))
+ def routingSlip(expression: Exchange => Any, separator: String) = wrap(target.routingSlip(expression, separator))
def routingSlip(expression: Exchange => Any) = wrap(target.routingSlip(expression))
-
def setBody(expression: Exchange => Any) = wrap(target.setBody(expression))
def setFaultBody(expression: Exchange => Any) = wrap(target.setFaultBody(expression))
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala Sun Jan 6 16:52:00 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.model.IdempotentConsumerDefinition
import org.apache.camel.processor.idempotent.MemoryIdempotentRepository
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala Sun Jan 6 16:52:00 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import org.apache.camel.model.LoadBalanceDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala Sun Jan 6 16:52:00 2013
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala.dsl
import java.util.concurrent.ExecutorService
-import java.util.concurrent.ScheduledExecutorService
import org.apache.camel.Processor
import org.apache.camel.model.SplitDefinition
import org.apache.camel.processor.aggregate.AggregationStrategy
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/LanguageFunction.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/LanguageFunction.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/LanguageFunction.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/LanguageFunction.scala Sun Jan 6 16:52:00 2013
@@ -20,8 +20,8 @@ import org.apache.camel.{Expression, Pre
import org.apache.camel.spi.Language
/**
- * A language which has a function that can be evaluated as either an {@link org.apache.camel.Expression}
- * or {@link org.apache.camel.Predicate}.
+ * A language which has a function that can be evaluated as either an {@link Expression}
+ * or {@link Predicate}.
*/
class LanguageFunction(language: Language, expression: String) extends Predicate with Expression {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/RichMockEndpoint.scala Sun Jan 6 16:52:00 2013
@@ -32,6 +32,8 @@ class RichMockEndpoint(val endpoint: Moc
def count : Int = endpoint.getExpectedCount
- def count_=(count: Int) = endpoint.expectedMessageCount(count)
+ def count_=(count: Int) {
+ endpoint.expectedMessageCount(count)
+ }
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/UsingModelTest.scala Sun Jan 6 16:52:00 2013
@@ -17,7 +17,7 @@
package org.apache.camel.scala
import junit.framework.TestCase
-import junit.framework.Assert._
+import junit.framework.TestCase.assertEquals
import org.apache.camel.model._
@@ -29,7 +29,7 @@ import org.apache.camel.model._
*/
class UsingModelTest extends TestCase {
- def testUsingModel() = {
+ def testUsingModel() {
val routes = new RoutesDefinition
val route = routes.route
route.from("seda:foo")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala Sun Jan 6 16:52:00 2013
@@ -31,7 +31,7 @@ import scala.xml.Elem
class ScalaTypeConverterTest extends CamelTestSupport {
@Test
- def testDocumentConverter = {
+ def testDocumentConverter() {
val exchange = context.getEndpoint("direct:start").createExchange
val result = context.getTypeConverter.convertTo(classOf[Document], exchange, <persons/>)
@@ -40,7 +40,7 @@ class ScalaTypeConverterTest extends Cam
}
@Test
- def testXmlStringToElemConverter = {
+ def testXmlStringToElemConverter() {
val exchange = context.getEndpoint("direct:start").createExchange
val result = context.getTypeConverter.convertTo(classOf[Elem], exchange, "<persons/>")
@@ -49,7 +49,7 @@ class ScalaTypeConverterTest extends Cam
}
@Test
- def testDomDocumentToElemConverter = {
+ def testDomDocumentToElemConverter() {
val exchange = context.getEndpoint("direct:start").createExchange
val factory = DocumentBuilderFactory.newInstance()
@@ -64,7 +64,7 @@ class ScalaTypeConverterTest extends Cam
}
@Test
- def testDomNodeToElemConverter = {
+ def testDomNodeToElemConverter() {
val exchange = context.getEndpoint("direct:start").createExchange
val factory = DocumentBuilderFactory.newInstance()
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala Sun Jan 6 16:52:00 2013
@@ -28,7 +28,7 @@ class AggregatorTest extends ScalaTestSu
val count = 100
@Test
- def testSimpleAggregator = {
+ def testSimpleAggregator() {
"mock:a" expect { _.received("message " + count) }
test {
for (i <- 1 to count) {
@@ -38,7 +38,7 @@ class AggregatorTest extends ScalaTestSu
}
@Test
- def testBlockAggregator = {
+ def testBlockAggregator() {
"mock:b" expect { _.received("message " + count) }
test {
for (i <- 1 to count) {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala Sun Jan 6 16:52:00 2013
@@ -23,12 +23,16 @@ import builder.RouteBuilder
class BasicRouteBuilderTest extends ScalaTestSupport {
@Test
- def testBasicRouteArrowSyntax() = assertBasicRoute("direct:a", "mock:a")
+ def testBasicRouteArrowSyntax() {
+ assertBasicRoute("direct:a", "mock:a")
+ }
@Test
- def testBasicRouteTextSyntax() = assertBasicRoute("direct:b", "mock:b")
+ def testBasicRouteTextSyntax() {
+ assertBasicRoute("direct:b", "mock:b")
+ }
- def assertBasicRoute(from: String, to: String) = {
+ def assertBasicRoute(from: String, to: String) {
to expect {
_.expectedMessageCount(1)
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ class CamelCBRTest extends CamelTestSupp
override protected def createRouteBuilder = builder
@Test
- def testFoo {
+ def testFoo() {
getMockEndpoint("mock:foo").expectedMessageCount(1)
getMockEndpoint("mock:other").expectedMessageCount(0)
@@ -35,7 +35,7 @@ class CamelCBRTest extends CamelTestSupp
}
@Test
- def testOther {
+ def testOther() {
getMockEndpoint("mock:foo").expectedMessageCount(0)
getMockEndpoint("mock:other").expectedMessageCount(1)
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala Sun Jan 6 16:52:00 2013
@@ -22,7 +22,7 @@ import builder.RouteBuilder
class ContentBasedRouterTest extends ScalaTestSupport {
@Test
- def testSimpleContentBasedRouter() = {
+ def testSimpleContentBasedRouter() {
"mock:polyglot" expect {_.expectedMessageCount(3)}
"mock:english" expect {_.received("<hello/>")}
"mock:dutch" expect {_.received("<hallo/>")}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala Sun Jan 6 16:52:00 2013
@@ -23,7 +23,7 @@ import builder.RouteBuilder
class ContentEnricherTest extends ScalaTestSupport {
@Test
- def testContentEnricherBySimpleProcessor() = {
+ def testContentEnricherBySimpleProcessor() {
"mock:a" expect { _.received ("James says hello",
"Hadrian says hello",
"Willem says hello")}
@@ -32,7 +32,7 @@ class ContentEnricherTest extends ScalaT
}
@Test
- def testContentEnricherByProcessorDef() = {
+ def testContentEnricherByProcessorDef() {
"mock:b" expect { _.received ("hello from the UK",
"hallo vanuit Belgie",
"bonjour de la douce France")}
@@ -41,7 +41,7 @@ class ContentEnricherTest extends ScalaT
}
@Test
- def testContentEnricherWithVelocity() = {
+ def testContentEnricherWithVelocity() {
"mock:c" expect { _.received ("<hello>James</hello>",
"<hello>Hadrian</hello>",
"<hello>Willem</hello>")}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ConvertBodyToTest.scala Sun Jan 6 16:52:00 2013
@@ -25,10 +25,10 @@ import org.junit.Test
class ConvertBodyToTest extends ScalaTestSupport {
@Test
- def testConvertBody() = {
+ def testConvertBody() {
val mock = getMockEndpoint("mock:b")
- mock.expectedMessageCount(1);
- mock.message(0).body().isInstanceOf(classOf[java.lang.Integer]);
+ mock.expectedMessageCount(1)
+ mock.message(0).body().isInstanceOf(classOf[java.lang.Integer])
// send a string
template.sendBody("direct:b", "74")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala Sun Jan 6 16:52:00 2013
@@ -27,7 +27,7 @@ import test.Adult
class DataFormatTest extends ScalaTestSupport {
@Test
- def testSimpleTrottler() = {
+ def testDataFormat() {
val person = new Adult("Captain Nemo")
"mock:a" expect { _.received(person) }
test {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ import builder.RouteBuilder
class DelayerTest extends ScalaTestSupport {
@Test
- def testSimpleDelayer() = {
+ def testSimpleDelayer() {
"mock:a" expect { _.count = 0 }
"seda:a" ! "any given message"
"mock:a" assert()
@@ -36,7 +36,7 @@ class DelayerTest extends ScalaTestSuppo
}
@Test
- def testBlockDelayer() = {
+ def testBlockDelayer() {
"mock:b" expect { _.count = 1 }
"mock:c" expect { _.count = 0 }
"seda:b" ! "any given message"
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala Sun Jan 6 16:52:00 2013
@@ -26,12 +26,16 @@ import builder.RouteBuilder
class EnricherTest extends ScalaTestSupport {
@Test
- def testSimpleEnricher() = testEnricher("direct:a", "mock:a")
+ def testSimpleEnricher() {
+ testEnricher("direct:a", "mock:a")
+ }
@Test
- def testBlockEnricher() = testEnricher("direct:b", "mock:b")
+ def testBlockEnricher() {
+ testEnricher("direct:b", "mock:b")
+ }
- def testEnricher(direct: String, mock: String) = {
+ def testEnricher(direct: String, mock: String) {
mock expect { _.received ("France:Paris", "UK:London") }
direct ! ("France", "UK")
mock assert()
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala Sun Jan 6 16:52:00 2013
@@ -19,7 +19,7 @@ package scala.dsl
import org.junit.Test
import builder.RouteBuilder
-import junit.framework.Assert._
+import junit.framework.TestCase.assertFalse
/**
* Test case for exception handler
@@ -29,7 +29,7 @@ class ExceptionHandlerTest extends Scala
var handled = false
@Test
- def testTryCatchFinally() = {
+ def testTryCatchFinally() {
"mock:a" expect { _.count = 1 }
"mock:b" expect { _.count = 1 }
"mock:c" expect { _.count = 1 }
@@ -37,7 +37,7 @@ class ExceptionHandlerTest extends Scala
test {
"direct:a" ! ("any given message", 'Symbol, 256)
}
- } catch { case _ => log.info("get the exception here")}
+ } catch { case _: Throwable => log.info("get the exception here")}
}
val builder =
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExchangePatternTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExchangePatternTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExchangePatternTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExchangePatternTest.scala Sun Jan 6 16:52:00 2013
@@ -24,7 +24,7 @@ import ExchangePattern.{InOnly, InOut}
class ExchangePatternTest extends ScalaTestSupport {
@Test
- def testInOnly() = {
+ def testInOnly() {
getMockEndpoint("mock:a").expectedMessageCount(1)
getMockEndpoint("mock:a").expectedExchangePattern(InOnly)
getMockEndpoint("mock:result").expectedMessageCount(1)
@@ -32,11 +32,11 @@ class ExchangePatternTest extends ScalaT
template.sendBody("direct:a", "Hello World")
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
}
@Test
- def testRequestInOnly() = {
+ def testRequestInOnly() {
getMockEndpoint("mock:a").expectedMessageCount(1)
getMockEndpoint("mock:a").expectedExchangePattern(InOnly)
getMockEndpoint("mock:result").expectedMessageCount(1)
@@ -44,11 +44,11 @@ class ExchangePatternTest extends ScalaT
template.requestBody("direct:a", "Hello World")
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
}
@Test
- def testInOut() = {
+ def testInOut() {
getMockEndpoint("mock:b").expectedMessageCount(1)
getMockEndpoint("mock:b").expectedExchangePattern(InOut)
getMockEndpoint("mock:result").expectedMessageCount(1)
@@ -56,23 +56,23 @@ class ExchangePatternTest extends ScalaT
template.sendBody("direct:b", "Hello World")
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
}
@Test
- def testRequestInOut() = {
+ def testRequestInOut() {
getMockEndpoint("mock:b").expectedMessageCount(1)
getMockEndpoint("mock:b").expectedExchangePattern(InOut)
getMockEndpoint("mock:result").expectedMessageCount(1)
getMockEndpoint("mock:result").expectedExchangePattern(InOut)
- template.requestBody("direct:b", "Hello World");
+ template.requestBody("direct:b", "Hello World")
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
}
@Test
- def testMixed() = {
+ def testMixed() {
getMockEndpoint("mock:c").expectedMessageCount(1)
getMockEndpoint("mock:c").expectedExchangePattern(InOut)
getMockEndpoint("mock:result").expectedMessageCount(1)
@@ -80,7 +80,7 @@ class ExchangePatternTest extends ScalaT
template.sendBody("direct:c", "Hello World")
- assertMockEndpointsSatisfied
+ assertMockEndpointsSatisfied()
}
val builder = new MyRouteBuilder
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala Sun Jan 6 16:52:00 2013
@@ -22,14 +22,14 @@ import builder.RouteBuilder
class FilterRouteBuilderTest extends ScalaTestSupport {
@Test
- def testSimpleFilter() = {
+ def testSimpleFilter() {
"mock:a" expect {_.expectedMessageCount(1)}
"direct:a" ! ("<hello/>", "<hellos/>")
"mock:a" assert()
}
@Test
- def testFilterWithAlternatives() = {
+ def testFilterWithAlternatives() {
"mock:b" expect {_.expectedMessageCount(1)}
"mock:c" expect {_.expectedMessageCount(1)}
"mock:d" expect {_.expectedMessageCount(3)}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ import builder.RouteBuilder
class HeaderContentBasedRouterTest extends ScalaTestSupport {
@Test
- def testXPathContentBasedRouter() = {
+ def testXPathContentBasedRouter() {
"mock:foo" expect {_.expectedBodiesReceived("Hello Foo")}
"mock:bar" expect {_.expectedBodiesReceived("Hello Bar")}
"mock:other" expect {_.expectedBodiesReceived("Hello World")}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala Sun Jan 6 16:52:00 2013
@@ -24,7 +24,7 @@ import junit.framework.Assert.assertEqua
class IdTest extends ScalaTestSupport {
@Test
- def testRouteA = {
+ def testRouteA() {
"mock:a" expect { _.expectedMessageCount(1)}
"mock:result" expect { _.expectedMessageCount(1)}
@@ -38,7 +38,7 @@ class IdTest extends ScalaTestSupport {
}
@Test
- def testRouteB() = {
+ def testRouteB() {
"mock:b" expect { _.expectedMessageCount(1)}
"mock:result" expect { _.expectedMessageCount(1)}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala Sun Jan 6 16:52:00 2013
@@ -28,12 +28,16 @@ import org.apache.camel.{Processor, Exch
class IdempotentConsumerTest extends ScalaTestSupport {
@Test
- def testSimple() = doTest("direct:a", "mock:a")
+ def testSimple() {
+ doTest("direct:a", "mock:a")
+ }
@Test
- def testBlock() = doTest("direct:b", "mock:b")
+ def testBlock() {
+ doTest("direct:b", "mock:b")
+ }
- def doTest(from: String, to: String) = {
+ def doTest(from: String, to: String) {
to expect { _.received("message 1", "message 2", "message 3")}
def send = sendMessage(from, _:String, _:String)
test {
@@ -48,7 +52,7 @@ class IdempotentConsumerTest extends Sca
def sendMessage(from: String, header: String, body: String) = {
template.send(from, new Processor() {
- def process(exchange: Exchange) = {
+ def process(exchange: Exchange) {
val in = exchange.getIn
in.setBody(body)
in.setHeader("messageId", header)
@@ -77,7 +81,7 @@ class IdempotentConsumerTest extends Sca
*/
class IdempotentConsumerEagerTest extends ScalaTestSupport {
- def testEagerIdempotentConsumer() = {
+ def testEagerIdempotentConsumer() {
"mock:result" expect { _.received("one", "two", "three")}
test {
sendMessage("1", "one")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala Sun Jan 6 16:52:00 2013
@@ -26,7 +26,7 @@ import org.apache.camel.processor.interc
class InterceptSendToTest extends ScalaTestSupport {
@Test
- def testSimpleSendTo() = {
+ def testSimpleSendTo() {
"mock:bar" expect {_.received("Hello World")}
"mock:detour" expect {_.received("Hello World")}
"mock:foo" expect {_.received("Bye World")}
@@ -57,7 +57,7 @@ class InterceptSendToTest extends ScalaT
class InterceptSendToWithPredicateTest extends ScalaTestSupport {
@Test
- def testSendToWithWhen() = {
+ def testSendToWithWhen() {
"mock:bar" expect {_.received("Hello World", "Hi")}
"mock:detour" expect {_.received("Hello World")}
"mock:foo" expect {_.received("Bye World", "Hi")}
@@ -88,7 +88,7 @@ class InterceptSendToWithPredicateTest e
class InterceptSendToSkipOriginalTest extends ScalaTestSupport {
@Test
- def testSendToAndSkipOriginal() = {
+ def testSendToAndSkipOriginal() {
"mock:bar" expect {_.received("Hello World")}
"mock:detour" expect {_.received("Bye World")}
"mock:foo" expect {_.count = 0}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ import builder.RouteBuilder
class LoadBalancerTest extends ScalaTestSupport {
@Test
- def testSimpleTrottler() = {
+ def testLoadBalancer() {
"mock:a" expect { _.received("message 1", "message 4") }
"mock:b" expect { _.received("message 2", "message 5") }
"mock:c" expect { _.received("message 3", "message 6") }
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala Sun Jan 6 16:52:00 2013
@@ -23,19 +23,27 @@ import builder.RouteBuilder
*/
class LoopTest extends ScalaTestSupport {
- def testSimpleStaticLoop() = doTestLoopStatic("direct:a", "mock:a")
- def testSimpleDynamicLoop() = doTestLoopDynamic("direct:b", "mock:b")
- def testBlockStaticLoop() = doTestLoopStatic("direct:c", "mock:c")
- def testBlockDynamicLoop() = doTestLoopDynamic("direct:d", "mock:d")
+ def testSimpleStaticLoop() {
+ doTestLoopStatic("direct:a", "mock:a")
+ }
+ def testSimpleDynamicLoop() {
+ doTestLoopDynamic("direct:b", "mock:b")
+ }
+ def testBlockStaticLoop() {
+ doTestLoopStatic("direct:c", "mock:c")
+ }
+ def testBlockDynamicLoop() {
+ doTestLoopDynamic("direct:d", "mock:d")
+ }
- def doTestLoopStatic(from: String, mock: String) = {
+ def doTestLoopStatic(from: String, mock: String) {
mock expect {_.count = 5}
test {
from ! ("ping")
}
}
- def doTestLoopDynamic(from: String, mock: String) = {
+ def doTestLoopDynamic(from: String, mock: String) {
mock expect {_.count = 5}
test {
from ! ("5")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala Sun Jan 6 16:52:00 2013
@@ -24,7 +24,7 @@ import org.apache.camel.processor.Multic
class ExplicitMulticastTest extends ScalaTestSupport {
@Test
- def testExplicitMulticast() = {
+ def testExplicitMulticast() {
"mock:a" expect { _.count = 3 }
"mock:b" expect { _.count = 3 }
"mock:c" expect { _.count = 3 }
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala Sun Jan 6 16:52:00 2013
@@ -75,7 +75,7 @@ class SOnExceptionRetryUntilWithDefaultE
var invoked = 0
@Test
- def testRetryUntil() = {
+ def testRetryUntil() {
val out = template.requestBody("direct:start", "Hello World")
assertEquals("Sorry", out)
assertEquals(3, invoked)
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala Sun Jan 6 16:52:00 2013
@@ -22,18 +22,26 @@ import org.junit.Test
class PipelineAndMulticastTest extends ScalaTestSupport {
@Test
- def testArrowRoute() = testRoute("direct:a", "mock:c", "mock:a", "mock:b")
+ def testArrowRoute() {
+ testRoute("direct:a", "mock:c", "mock:a", "mock:b")
+ }
@Test
- def testToRoute() = testRoute("direct:d", "mock:f", "mock:d", "mock:e")
+ def testToRoute() {
+ testRoute("direct:d", "mock:f", "mock:d", "mock:e")
+ }
@Test
- def testArrowBlockRoute() = testRoute("direct:g", "mock:i", "mock:g", "mock:h")
+ def testArrowBlockRoute() {
+ testRoute("direct:g", "mock:i", "mock:g", "mock:h")
+ }
@Test
- def testToBlockRoute() = testRoute("direct:j", "mock:l", "mock:j", "mock:k")
+ def testToBlockRoute() {
+ testRoute("direct:j", "mock:l", "mock:j", "mock:k")
+ }
- def testRoute(from: String, end: String, multis: String*) = {
+ def testRoute(from: String, end: String, multis: String*) {
multis.foreach ( _.expect { _.received("<hello/>")})
end expect { _.received("<olleh/>")}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala Sun Jan 6 16:52:00 2013
@@ -21,18 +21,26 @@ import org.junit.Test
class PipelineRouteBuilderTest extends ScalaTestSupport {
@Test
- def testPipelineWithArrows() = testPipeline("direct:a", "mock:a", "mock:b")
+ def testPipelineWithArrows() {
+ testPipeline("direct:a", "mock:a", "mock:b")
+ }
@Test
- def testPipelineWithTos() = testPipeline("direct:c", "mock:c", "mock:d")
+ def testPipelineWithTos() {
+ testPipeline("direct:c", "mock:c", "mock:d")
+ }
@Test
- def testPipelineBlockWithArrows() = testPipeline("direct:e", "mock:e", "mock:f")
+ def testPipelineBlockWithArrows() {
+ testPipeline("direct:e", "mock:e", "mock:f")
+ }
@Test
- def testPipelineBlockWithTos() = testPipeline("direct:g", "mock:g", "mock:h")
+ def testPipelineBlockWithTos() {
+ testPipeline("direct:g", "mock:g", "mock:h")
+ }
- def testPipeline(from: String, to: String*) = {
+ def testPipeline(from: String, to: String*) {
to.foreach {
_.expect { _.expectedMessageCount(1) }
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala Sun Jan 6 16:52:00 2013
@@ -51,7 +51,7 @@ class PipelineTest extends ScalaTestSupp
}
@Test
- def testIncrementSimple() = {
+ def testIncrementSimple() {
"mock:result" expect { _.received(new java.lang.Integer(4))}
test {
"direct:a" ! 1
@@ -59,7 +59,7 @@ class PipelineTest extends ScalaTestSupp
}
@Test
- def testIncrementBlock() = {
+ def testIncrementBlock() {
"mock:result" expect { _.received(new java.lang.Integer(4))}
test {
"direct:b" ! 1
@@ -67,7 +67,7 @@ class PipelineTest extends ScalaTestSupp
}
@Test
- def testExplicitPipeline() = {
+ def testExplicitPipeline() {
test {
"direct:start" ! "Hello world"
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala Sun Jan 6 16:52:00 2013
@@ -24,21 +24,21 @@ import test.{Adult, Toddler, Envelope}
class RecipientListRouteTest extends ScalaTestSupport {
@Test
- def testRecipientList() = {
+ def testRecipientList() {
"mock:a" expect {_.count = 1}
"direct:a" ! ("send this message to mock:a", "send this message to mock:z")
"mock:a" assert()
}
@Test
- def testRecipientListWithPatternMatching() = {
+ def testRecipientListWithPatternMatching() {
"mock:playgarden" expect {_.count = 1}
"direct:b" ! (new Adult("Gert"), new Toddler("Ewan"))
"mock:playgarden" assert()
}
@Test
- def testRecipientListWithJXPath() = {
+ def testRecipientListWithJXPath() {
"mock:c" expect {_.count = 2}
"mock:d" expect {_.count = 1}
"direct:c" ! (new Envelope("mock:d"), new Envelope("mock:y"))
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ import builder.RouteBuilder
class ResequencerTest extends ScalaTestSupport {
@Test
- def testSimpleResequencer() = {
+ def testSimpleResequencer() {
"mock:a" expect { _.received("message 1", "message 2", "message 3", "message 4", "message 5") }
test {
"direct:a" ! ("message 5", "message 1", "message 3", "message 2", "message 4")
@@ -33,7 +33,7 @@ class ResequencerTest extends ScalaTestS
}
@Test
- def testBlockResequencer() = {
+ def testBlockResequencer() {
"mock:b" expect (_.received("message 5", "message 1", "message 3", "message 2", "message 4"))
"mock:c" expect (_.received("message 1", "message 2", "message 3", "message 4", "message 5"))
test {
@@ -42,7 +42,7 @@ class ResequencerTest extends ScalaTestS
}
@Test
- def testBatchResequencer() = {
+ def testBatchResequencer() {
"mock:d" expect (_.received("message 5", "message 1", "message 3", "message 2"))
"mock:e" expect (_.count = 0)
test {
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=1429554&r1=1429553&r2=1429554&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 Sun Jan 6 16:52:00 2013
@@ -21,7 +21,7 @@ import org.apache.camel.component.mock.M
class RichTestUri(uri: String, support: ScalaTestSupport) {
- def !(messages: Any*) = {
+ def !(messages: Any*) {
messages.foreach {
_ match {
case exchange: Exchange => support.getTemplate.send(uri, exchange)
@@ -30,11 +30,13 @@ class RichTestUri(uri: String, support:
}
}
- def expect(block: MockEndpoint => Unit) = {
+ def expect(block: MockEndpoint => Unit) {
val mock = support.mock(uri)
block(mock)
}
- def assert() = support.mock(uri).assertIsSatisfied()
+ def assert() {
+ support.mock(uri).assertIsSatisfied()
+ }
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala Sun Jan 6 16:52:00 2013
@@ -29,7 +29,7 @@ class RollbackTest extends ScalaTestSupp
var handled = false
@Test
- def testSimple() = {
+ def testSimple() {
test {
try {
template.requestBody("direct:a", "The Joker")
@@ -43,7 +43,7 @@ class RollbackTest extends ScalaTestSupp
}
@Test
- def testBlock() = {
+ def testBlock() {
"mock:b" expect { _.count = 2 }
"mock:ok" expect { _.count = 1 }
test {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala Sun Jan 6 16:52:00 2013
@@ -24,7 +24,7 @@ import org.junit.Assert.assertEquals
class RouteIdTest extends ScalaTestSupport {
@Test
- def testRouteA() = {
+ def testRouteA() {
"mock:a" expect { _.expectedMessageCount(1)}
test {
@@ -37,7 +37,7 @@ class RouteIdTest extends ScalaTestSuppo
}
@Test
- def testRouteB() = {
+ def testRouteB() {
"mock:b" expect { _.expectedMessageCount(1)}
test {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SValidateTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SValidateTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SValidateTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SValidateTest.scala Sun Jan 6 16:52:00 2013
@@ -22,7 +22,7 @@ import org.apache.camel.processor.valida
import org.apache.camel.CamelExecutionException
import org.apache.camel.TestSupport.assertIsInstanceOf
-import junit.framework.Assert.{fail, assertTrue}
+import junit.framework.TestCase.{fail, assertTrue}
/**
* Scala DSL equivalent for the ValidateSimpleTest, using simple one-line Scala DSL syntax
@@ -30,7 +30,7 @@ import junit.framework.Assert.{fail, ass
class SValidateSimpleTest extends ValidateSimpleTest with RouteBuilderSupport {
// we need to override the test method because the validation exception looks slightly different in Scala
- override def testSendNotMatchingMessage() = {
+ override def testSendNotMatchingMessage() {
resultEndpoint.expectedMessageCount(0)
try {
@@ -62,7 +62,7 @@ class SValidateSimpleTest extends Valida
class SValidateRegExpTest extends ValidateRegExpTest with RouteBuilderSupport {
// we need to override the test method because the validation exception looks slightly different in Scala
- override def testSendNotMatchingMessage() = {
+ override def testSendNotMatchingMessage() {
resultEndpoint.expectedMessageCount(0)
try {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala Sun Jan 6 16:52:00 2013
@@ -29,7 +29,9 @@ abstract class ScalaTestSupport extends
implicit def mockWrapper(endpoint: MockEndpoint) = new RichMockEndpoint(endpoint)
val endpoints = new ArrayBuffer[MockEndpoint]()
- def assert(uri: String) = getMockEndpoint(uri).assertIsSatisfied()
+ def assert(uri: String) {
+ getMockEndpoint(uri).assertIsSatisfied()
+ }
protected[scala] def getTemplate = template
@@ -45,12 +47,12 @@ abstract class ScalaTestSupport extends
override protected def createRouteBuilder = builder
- override def setUp() = {
+ override def setUp() {
super.setUp()
endpoints.foreach(_.reset())
}
- def test(block : => Unit) = {
+ def test(block : => Unit) {
block
endpoints.foreach(_.assertIsSatisfied())
}
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=1429554&r1=1429553&r2=1429554&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 Sun Jan 6 16:52:00 2013
@@ -26,26 +26,34 @@ import org.junit.Test
class SetBodyTest extends ScalaTestSupport {
@Test
- def testSimpleSetBody() = doTestConstant("direct:a", "mock:a")
+ def testSimpleSetBody() {
+ doTestConstant("direct:a", "mock:a")
+ }
@Test
- def testBlockSetBody() = doTestConstant("direct:b", "mock:b")
+ def testBlockSetBody() {
+ doTestConstant("direct:b", "mock:b")
+ }
@Test
- def testSimpleExpression() = doTestExpression("direct:c", "mock:c")
+ def testSimpleExpression() {
+ doTestExpression("direct:c", "mock:c")
+ }
@Test
- def testBodyExpression() = doTestExpression("direct:d", "mock:d")
+ def testBodyExpression() {
+ doTestExpression("direct:d", "mock:d")
+ }
- def doTestConstant(from: String, mock: String) = {
+ def doTestConstant(from: String, mock: String) {
mock expect {_.received("pong")}
test {
from ! ("ping")
}
}
- def doTestExpression(from: String, mock: String) = {
+ def doTestExpression(from: String, mock: String) {
mock expect {_.received("Duchess", "Toulouse")}
test {
from ! (new Cat("Duchess"), new Cat("Toulouse"))
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala Sun Jan 6 16:52:00 2013
@@ -29,16 +29,24 @@ import org.junit.Assert.assertEquals
class SetExchangePatternTest extends ScalaTestSupport {
@Test
- def testSimpleInOnly() = doTest("direct:a", "mock:a", InOnly)
+ def testSimpleInOnly() {
+ doTest("direct:a", "mock:a", InOnly)
+ }
@Test
- def testBlockInOnly() = doTest("direct:b", "mock:b", InOnly)
+ def testBlockInOnly() {
+ doTest("direct:b", "mock:b", InOnly)
+ }
@Test
- def testSimpleInOut() = doTest("direct:c", "mock:c", InOut)
+ def testSimpleInOut() {
+ doTest("direct:c", "mock:c", InOut)
+ }
@Test
- def testBlockInOut() = doTest("direct:d", "mock:d", InOut)
+ def testBlockInOut() {
+ doTest("direct:d", "mock:d", InOut)
+ }
- def doTest(from: String, to: String, expected: ExchangePattern) = {
+ def doTest(from: String, to: String, expected: ExchangePattern) {
to expect { _.count = 1}
val exchange = in("MyTestBody")
expected match {
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=1429554&r1=1429553&r2=1429554&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 Sun Jan 6 16:52:00 2013
@@ -27,26 +27,34 @@ import org.junit.Test
class SetHeaderTest extends ScalaTestSupport {
@Test
- def testSimpleSetBody() = doTestConstant("direct:a", "mock:a")
+ def testSimpleSetBody() {
+ doTestConstant("direct:a", "mock:a")
+ }
@Test
- def testBlockSetBody() = doTestConstant("direct:b", "mock:b")
+ def testBlockSetBody() {
+ doTestConstant("direct:b", "mock:b")
+ }
@Test
- def testSimpleExpression() = doTestExpression("direct:c", "mock:c")
+ def testSimpleExpression() {
+ doTestExpression("direct:c", "mock:c")
+ }
@Test
- def testBodyExpression() = doTestExpression("direct:d", "mock:d")
+ def testBodyExpression() {
+ doTestExpression("direct:d", "mock:d")
+ }
- def doTestConstant(from: String, mock: String) = {
+ def doTestConstant(from: String, mock: String) {
mock expect { _.headerReceived("response", "pong?")}
test {
from ! ("ping")
}
}
- def doTestExpression(from: String, mock: String) = {
+ def doTestExpression(from: String, mock: String) {
mock expect {_.headerReceived("genus", "felis")}
test {
from ! (new Cat("Duchess"), new Cat("Toulouse"))
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala Sun Jan 6 16:52:00 2013
@@ -27,7 +27,7 @@ import org.junit.Test
class SimpleBeanTest extends ScalaTestSupport {
@Test
- def testSimpleObject() = {
+ def testSimpleObject() {
"mock:a" expect {_.received("Lucky Luke rides Jolly Jumper")}
test {
"direct:a" ! ("Lucky Luke")
@@ -35,7 +35,7 @@ class SimpleBeanTest extends ScalaTestSu
}
@Test
- def testSimpleClass() = {
+ def testSimpleClass() {
"mock:b" expect {_.received("Batman drives the batmobile")}
test {
"direct:b" ! ("Batman")
@@ -43,7 +43,7 @@ class SimpleBeanTest extends ScalaTestSu
}
@Test
- def testSimpleRef() = {
+ def testSimpleRef() {
"mock:c" expect {_.received("Aladin flies a carpet")}
test {
"direct:c" ! ("Aladin")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala Sun Jan 6 16:52:00 2013
@@ -27,14 +27,14 @@ import org.junit.Test
class SplitterRouteBuilderTest extends ScalaTestSupport {
@Test
- def testSimpleSplitter() = {
+ def testSimpleSplitter() {
"mock:a" expect { _.count = 3}
"direct:a" ! <persons><person id="1"/><person id="2"/><person id="3"/></persons>
"mock:a" assert()
}
@Test
- def testBlockSplitter() = {
+ def testBlockSplitter() {
"mock:b" expect { _.count = 3}
"mock:c" expect { _.count = 3}
"direct:b" ! <persons><person id="1"/><person id="2"/><person id="3"/></persons>
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeHeaderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeHeaderTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeHeaderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeHeaderTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ import org.junit.Test
class SplitterTokenizeHeaderTest extends ScalaTestSupport {
@Test
- def testSplitterTokenize() = {
+ def testSplitterTokenize() {
val mock = getMockEndpoint("mock:b")
mock.expectedMessageCount(3)
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizePairTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizePairTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizePairTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizePairTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ import org.junit.Test
class SplitterTokenizePairTest extends ScalaTestSupport {
@Test
- def testSplitterTokenize() = {
+ def testSplitterTokenize() {
val mock = getMockEndpoint("mock:b")
mock.expectedBodiesReceived("Claus", "James", "Willem")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ import org.junit.Test
class SplitterTokenizeTest extends ScalaTestSupport {
@Test
- def testSplitterTokenize() = {
+ def testSplitterTokenize() {
val mock = getMockEndpoint("mock:b")
mock.expectedBodiesReceived("Claus", "James", "Willem")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeXMLTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeXMLTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeXMLTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeXMLTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ import org.junit.Test
class SplitterTokenizeXMLTest extends ScalaTestSupport {
@Test
- def testSplitterTokenizeXML() = {
+ def testSplitterTokenizeXML() {
val mock = getMockEndpoint("mock:b")
mock.expectedBodiesReceived("<person>Claus</person>", "<person>James</person>", "<person>Willem</person>")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala Sun Jan 6 16:52:00 2013
@@ -26,7 +26,7 @@ import org.junit.Test
class ThrottlerTest extends ScalaTestSupport {
@Test
- def testSimpleThrottler() = {
+ def testSimpleThrottler() {
"mock:a" expect { _.count = 3 }
"mock:a" expect { _.setResultWaitTime(1500) }
for (id <- 1 to 6) "seda:a" ! id
@@ -34,7 +34,7 @@ class ThrottlerTest extends ScalaTestSup
}
@Test
- def testBlockThrottler() = {
+ def testBlockThrottler() {
"mock:b" expect { _.count = 6 }
"mock:c" expect { _.count = 3 }
"mock:c" expect { _.setResultWaitTime(1500) }
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala Sun Jan 6 16:52:00 2013
@@ -29,7 +29,7 @@ class TryCatchFinallyTest extends ScalaT
var handled = false
@Test
- def testTryCatchFinally() = {
+ def testTryCatchFinally() {
"mock:a" expect { _.count = 1 }
"mock:b" expect { _.count = 1 }
"mock:c" expect { _.count = 2 }
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala Sun Jan 6 16:52:00 2013
@@ -27,18 +27,26 @@ import org.junit.Test
class WiretapTest extends ScalaTestSupport {
@Test
- def testSimpleTap() = doTestWiretap("direct:a", "mock:a")
+ def testSimpleTap() {
+ doTestWiretap("direct:a", "mock:a")
+ }
@Test
- def testBlockTap() = doTestWiretap("direct:b", "mock:b")
+ def testBlockTap() {
+ doTestWiretap("direct:b", "mock:b")
+ }
@Test
- def testSimpleTapWithBody() = doTestWiretapWithBody("direct:c", "mock:c")
+ def testSimpleTapWithBody() {
+ doTestWiretapWithBody("direct:c", "mock:c")
+ }
@Test
- def testBlockTapWithBody() = doTestWiretapWithBody("direct:d", "mock:d")
+ def testBlockTapWithBody() {
+ doTestWiretapWithBody("direct:d", "mock:d")
+ }
- def doTestWiretap(from: String, to: String) = {
+ def doTestWiretap(from: String, to: String) {
to expect { _.received("Calling Elvis", "Calling Paul")}
mock("mock:tap").expectedBodiesReceivedInAnyOrder("Elvis is alive!", "Stop singing, you're not Elvis")
test {
@@ -46,7 +54,7 @@ class WiretapTest extends ScalaTestSuppo
}
}
- def doTestWiretapWithBody(from: String, to: String) = {
+ def doTestWiretapWithBody(from: String, to: String) {
to expect { _.received(Adult("Elvis"), Adult("Paul"))}
mock("mock:tap-with-body").expectedBodiesReceived("Tapped!", "Tapped!")
test {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/XPathContentBasedRouterTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/XPathContentBasedRouterTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/XPathContentBasedRouterTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/XPathContentBasedRouterTest.scala Sun Jan 6 16:52:00 2013
@@ -25,7 +25,7 @@ import org.junit.Test
class XPathContentBasedRouterTest extends ScalaTestSupport {
@Test
- def testXPathContentBasedRouter() = {
+ def testXPathContentBasedRouter() {
"mock:english" expect {_.expectedBodiesReceived("<hello/>")}
"mock:dutch" expect {_.expectedBodiesReceived("<hallo/>")}
"mock:german" expect {_.expectedBodiesReceived("<hallo/>")}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/RouteBuilderUnwrapTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/RouteBuilderUnwrapTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/RouteBuilderUnwrapTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/RouteBuilderUnwrapTest.scala Sun Jan 6 16:52:00 2013
@@ -28,7 +28,7 @@ class RouteBuilderUnwrapTest extends Ass
val person = new PersonWrapper
- def testUnwrap() = {
+ def testUnwrap() {
//access the wrapper
assertEquals("Apache Camel", person.vote)
@@ -39,7 +39,9 @@ class RouteBuilderUnwrapTest extends Ass
}
@Test
- def testUnwrapWhenNecessary() = builder.testUnwrap()
+ def testUnwrapWhenNecessary() {
+ builder.testUnwrap()
+ }
class PersonWrapper extends Wrapper[Person] {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala?rev=1429554&r1=1429553&r2=1429554&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala Sun Jan 6 16:52:00 2013
@@ -29,15 +29,15 @@ import org.junit.Test
class DiscoverRouteBuilderTest extends Assert {
@Test
- def testDiscovery = {
+ def testDiscovery() {
val spring = new ClassPathXmlApplicationContext("org/apache/camel/scala/dsl/builder/scan/scan-camel-context.xml")
val camel = spring.getBean("myCamel").asInstanceOf[CamelContext]
assertNotNull(camel)
- assertEquals(1, camel.getRoutes().size())
+ assertEquals(1, camel.getRoutes.size())
// let us just send a simple message to make sure we discovered the correct RouteBuilder
val template = camel.createProducerTemplate()
- template.sendBody("direct:scan", "request");
+ template.sendBody("direct:scan", "request")
val mock = camel.getEndpoint("mock:discovery").asInstanceOf[MockEndpoint]
mock.expectedMessageCount(1)
mock.assertIsSatisfied()