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 2009/09/17 14:27:07 UTC
svn commit: r816164 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/file/ test/java/org/apache/camel/
test/java/org/apache/camel/language/
Author: davsclaus
Date: Thu Sep 17 12:27:06 2009
New Revision: 816164
URL: http://svn.apache.org/viewvc?rev=816164&view=rev
Log:
MR-187: Added unit tests
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/HeaderTest.java
- copied, changed from r816135, camel/trunk/camel-core/src/test/java/org/apache/camel/language/ConstantTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java (with props)
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/ConstantTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java?rev=816164&r1=816163&r2=816164&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java Thu Sep 17 12:27:06 2009
@@ -55,7 +55,7 @@
return;
}
for (File file : files) {
- // createa a generic file
+ // creates a generic file
GenericFile<File> gf = asGenericFile(endpointPath, file);
if (file.isDirectory()) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java?rev=816164&r1=816163&r2=816164&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java Thu Sep 17 12:27:06 2009
@@ -24,8 +24,8 @@
* @version $Revision$
*/
public abstract class LanguageTestSupport extends ExchangeTestSupport {
- protected abstract String getLanguageName();
+ protected abstract String getLanguageName();
/**
* Asserts that the given predicate expression evaluated on the current language and message
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/ConstantTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/ConstantTest.java?rev=816164&r1=816163&r2=816164&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/ConstantTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/ConstantTest.java Thu Sep 17 12:27:06 2009
@@ -20,7 +20,7 @@
public class ConstantTest extends LanguageTestSupport {
- public void testSimpleExpressions() throws Exception {
+ public void testConstantExpressions() throws Exception {
// We can put anything in here, the expression will
// always evaluate to itself
assertExpression("a value", "a value");
Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/language/HeaderTest.java (from r816135, camel/trunk/camel-core/src/test/java/org/apache/camel/language/ConstantTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/HeaderTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/language/HeaderTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/language/ConstantTest.java&r1=816135&r2=816164&rev=816164&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/ConstantTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/HeaderTest.java Thu Sep 17 12:27:06 2009
@@ -18,19 +18,17 @@
import org.apache.camel.LanguageTestSupport;
-public class ConstantTest extends LanguageTestSupport {
+public class HeaderTest extends LanguageTestSupport {
- public void testSimpleExpressions() throws Exception {
- // We can put anything in here, the expression will
- // always evaluate to itself
- assertExpression("a value", "a value");
+ public void testHeaderExpressions() throws Exception {
+ assertExpression("foo", "abc");
}
-
+
public void testPredicates() throws Exception {
- assertPredicate("another value");
+ assertPredicate("foo");
}
protected String getLanguageName() {
- return "constant";
+ return "header";
}
-}
+}
\ No newline at end of file
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java?rev=816164&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java Thu Sep 17 12:27:06 2009
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language;
+
+import org.apache.camel.LanguageTestSupport;
+import org.apache.camel.Exchange;
+
+public class PropertyTest extends LanguageTestSupport {
+
+ public void testProertyExpressions() throws Exception {
+ assertExpression("quote", "Camel rocks");
+ }
+
+ public void testPredicates() throws Exception {
+ assertPredicate("quote");
+ }
+
+ protected String getLanguageName() {
+ return "property";
+ }
+
+ @Override
+ protected void populateExchange(Exchange exchange) {
+ super.populateExchange(exchange);
+ exchange.setProperty("quote", "Camel rocks");
+ }
+}
\ No newline at end of file
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java?rev=816164&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java Thu Sep 17 12:27:06 2009
@@ -0,0 +1,82 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language;
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangeTestSupport;
+import org.apache.camel.Expression;
+import org.apache.camel.language.tokenizer.TokenizeLanguage;
+
+public class TokenizerTest extends ExchangeTestSupport {
+
+ @Override
+ protected void populateExchange(Exchange exchange) {
+ super.populateExchange(exchange);
+ exchange.getIn().setHeader("names", "Claus,James,Willem");
+ }
+
+ public void testTokenizeHeader() throws Exception {
+ Expression exp = TokenizeLanguage.tokenize("names", ",");
+
+ List names = exp.evaluate(exchange, List.class);
+ assertEquals(3, names.size());
+
+ assertEquals("Claus", names.get(0));
+ assertEquals("James", names.get(1));
+ assertEquals("Willem", names.get(2));
+ }
+
+ public void testTokenizeBody() throws Exception {
+ Expression exp = TokenizeLanguage.tokenize(",");
+
+ exchange.getIn().setBody("Hadrian,Charles");
+
+ List names = exp.evaluate(exchange, List.class);
+ assertEquals(2, names.size());
+
+ assertEquals("Hadrian", names.get(0));
+ assertEquals("Charles", names.get(1));
+ }
+
+ public void testTokenizeBodyRegEx() throws Exception {
+ Expression exp = TokenizeLanguage.tokenize("(\\W+)\\s*", true);
+
+ exchange.getIn().setBody("The little fox");
+
+ List names = exp.evaluate(exchange, List.class);
+ assertEquals(3, names.size());
+
+ assertEquals("The", names.get(0));
+ assertEquals("little", names.get(1));
+ assertEquals("fox", names.get(2));
+ }
+
+ public void testTokenizeHeaderRegEx() throws Exception {
+ Expression exp = TokenizeLanguage.tokenize("quote", "(\\W+)\\s*", true);
+
+ exchange.getIn().setHeader("quote", "Camel rocks");
+
+ List names = exp.evaluate(exchange, List.class);
+ assertEquals(2, names.size());
+
+ assertEquals("Camel", names.get(0));
+ assertEquals("rocks", names.get(1));
+ }
+
+}
\ No newline at end of file
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date