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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -14,13 +14,13 @@ * 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 builder.{RouteBuilder, RouteBuilderSupport} import org.apache.camel.processor.{ValidateRegExpTest, ValidateSimpleTest} import org.apache.camel.processor.validation.PredicateValidationException import org.apache.camel.CamelExecutionException -import org.apache.camel.TestSupport.{assertIsInstanceOf} +import org.apache.camel.TestSupport.assertIsInstanceOf import junit.framework.Assert.{fail, assertTrue} @@ -30,25 +30,25 @@ 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 = { - resultEndpoint.expectedMessageCount(0); + override def testSendNotMatchingMessage() = { + resultEndpoint.expectedMessageCount(0) try { - template.sendBody(startEndpoint, "1.1.2010"); - fail("CamelExecutionException expected"); + template.sendBody(startEndpoint, "1.1.2010") + fail("CamelExecutionException expected") } catch { case e: CamelExecutionException => { // expected - assertIsInstanceOf(classOf[PredicateValidationException], e.getCause()) + assertIsInstanceOf(classOf[PredicateValidationException], e.getCause) // as the Expression could be different between the DSL and simple language, here we just check part of the message assertTrue("Get a wrong exception message", - e.getCause().getMessage().startsWith("Validation failed for Predicate[org.apache.camel.scala.ScalaPredicate")); + e.getCause.getMessage.startsWith("Validation failed for Predicate[org.apache.camel.scala.ScalaPredicate")) assertTrue("Get a wrong exception message", - e.getCause().getMessage().endsWith("Exchange[Message: 1.1.2010]")); + e.getCause.getMessage.endsWith("Exchange[Message: 1.1.2010]")) } } - assertMockEndpointsSatisfied(); + assertMockEndpointsSatisfied() } override def createRouteBuilder = new RouteBuilder { @@ -62,25 +62,25 @@ 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 = { - resultEndpoint.expectedMessageCount(0); + override def testSendNotMatchingMessage() = { + resultEndpoint.expectedMessageCount(0) try { - template.sendBody(startEndpoint, "1.1.2010"); - fail("CamelExecutionException expected"); + template.sendBody(startEndpoint, "1.1.2010") + fail("CamelExecutionException expected") } catch { case e: CamelExecutionException => { // expected - assertIsInstanceOf(classOf[PredicateValidationException], e.getCause()) + assertIsInstanceOf(classOf[PredicateValidationException], e.getCause) // as the Expression could be different between the DSL and simple language, here we just check part of the message assertTrue("Get a wrong exception message", - e.getCause().getMessage().startsWith("Validation failed for Predicate[org.apache.camel.scala.ScalaPredicate")); + e.getCause.getMessage.startsWith("Validation failed for Predicate[org.apache.camel.scala.ScalaPredicate")) assertTrue("Get a wrong exception message", - e.getCause().getMessage().endsWith("Exchange[Message: 1.1.2010]")); + e.getCause.getMessage.endsWith("Exchange[Message: 1.1.2010]")) } } - assertMockEndpointsSatisfied(); + assertMockEndpointsSatisfied() } override def createRouteBuilder = new RouteBuilder {
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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -29,9 +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 + protected[scala] def getTemplate = template protected[scala] def mock(uri: String) = { val mock = getMockEndpoint(uri) @@ -45,14 +45,14 @@ abstract class ScalaTestSupport extends override protected def createRouteBuilder = builder - override def setUp = { - super.setUp + override def setUp() = { + super.setUp() endpoints.foreach(_.reset()) } def test(block : => Unit) = { block - endpoints.foreach(_.assertIsSatisfied) + endpoints.foreach(_.assertIsSatisfied()) } override def createJndiContext = { 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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -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 builder.RouteBuilder import org.apache.camel.scala.test.Cat @@ -27,11 +27,13 @@ class SetBodyTest extends ScalaTestSuppo @Test def testSimpleSetBody() = doTestConstant("direct:a", "mock:a") + @Test def testBlockSetBody() = doTestConstant("direct:b", "mock:b") @Test def testSimpleExpression() = doTestExpression("direct:c", "mock:c") + @Test def testBodyExpression() = doTestExpression("direct:d", "mock:d") 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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -48,7 +48,7 @@ class SetExchangePatternTest extends Sca test { from ! exchange } - assertEquals(expected, getMockEndpoint(to).getReceivedExchanges().get(0).getPattern()) + assertEquals(expected, getMockEndpoint(to).getReceivedExchanges.get(0).getPattern) } val builder = new RouteBuilder { 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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.camel.scala -package dsl; +package dsl import builder.RouteBuilder import org.apache.camel.scala.test.Cat @@ -28,11 +28,13 @@ class SetHeaderTest extends ScalaTestSup @Test def testSimpleSetBody() = doTestConstant("direct:a", "mock:a") + @Test def testBlockSetBody() = doTestConstant("direct:b", "mock:b") @Test def testSimpleExpression() = doTestExpression("direct:c", "mock:c") + @Test def testBodyExpression() = doTestExpression("direct:d", "mock:d") 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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -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/SplitterTokenizeXMLTest.scala URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterTokenizeXMLTest.scala?rev=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.camel -package scala.dsl; +package scala.dsl import builder.RouteBuilder import org.junit.Test @@ -26,10 +26,10 @@ import org.junit.Assert._ */ class TryCatchFinallyTest extends ScalaTestSupport { - var handled = false; + var handled = false @Test - def testTryCatchFinally = { + def testTryCatchFinally() = { "mock:a" expect { _.count = 1 } "mock:b" expect { _.count = 1 } "mock:c" expect { _.count = 2 } @@ -49,7 +49,7 @@ class TryCatchFinallyTest extends ScalaT val catchProcessor = (exchange: Exchange) => { // we shouldn't get any Strings here - assertFalse(exchange.getIn().getBody().getClass().equals(classOf[String])) + assertFalse(exchange.getIn.getBody.getClass.equals(classOf[String])) // the exchange shouldn't have been marked failed assertFalse(exchange.isFailed) } @@ -63,7 +63,7 @@ class TryCatchFinallyTest extends ScalaT process(catchProcessor) to ("mock:b") } ensure { - to ("mock:c"); + to ("mock:c") } } //END SNIPPET: block 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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -27,14 +27,16 @@ 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) = { to expect { _.received("Calling Elvis", "Calling Paul")} 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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.scala.dsl.builder; +package org.apache.camel.scala.dsl.builder import org.apache.camel.scala.Wrapper import org.apache.camel.scala.test.{Person,Adult} @@ -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,7 @@ 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/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=1411260&r1=1411259&r2=1411260&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 Mon Nov 19 15:57:24 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.scala.test; +package org.apache.camel.scala.test import _root_.scala.reflect.BeanProperty Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Envelope.scala URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Envelope.scala?rev=1411260&r1=1411259&r2=1411260&view=diff ============================================================================== --- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Envelope.scala (original) +++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Envelope.scala Mon Nov 19 15:57:24 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.scala.test; +package org.apache.camel.scala.test /** * Just a simple envelope test class Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Person.scala URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Person.scala?rev=1411260&r1=1411259&r2=1411260&view=diff ============================================================================== --- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Person.scala (original) +++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Person.scala Mon Nov 19 15:57:24 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.scala.test; +package org.apache.camel.scala.test import _root_.scala.reflect.BeanProperty
