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 2015/12/17 08:37:57 UTC
[7/8] camel git commit: Dont have test files in root dir
Dont have test files in root dir
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5f252c44
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f252c44
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f252c44
Branch: refs/heads/master
Commit: 5f252c440486bc4dee353ae46a7bee312eee0147
Parents: 87ce9cc
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 17 08:34:48 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 17 08:34:48 2015 +0100
----------------------------------------------------------------------
.../camel/component/spark/SparkProducerTest.java | 2 +-
.../camel-spark/src/test/resources/testrdd.txt | 19 +++++++++++++++++++
components/camel-spark/testrdd.txt | 19 -------------------
3 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5f252c44/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
index 2cf548c..a1bf282 100644
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
+++ b/components/camel-spark/src/test/java/org/apache/camel/component/spark/SparkProducerTest.java
@@ -73,7 +73,7 @@ public class SparkProducerTest extends CamelTestSupport {
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry registry = super.createRegistry();
- registry.bind("testFileRdd", sparkContext.textFile("testrdd.txt"));
+ registry.bind("testFileRdd", sparkContext.textFile("src/test/resources/testrdd.txt"));
if (shouldRunHive) {
registry.bind("hiveContext", hiveContext);
http://git-wip-us.apache.org/repos/asf/camel/blob/5f252c44/components/camel-spark/src/test/resources/testrdd.txt
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/resources/testrdd.txt b/components/camel-spark/src/test/resources/testrdd.txt
new file mode 100644
index 0000000..5bb464c
--- /dev/null
+++ b/components/camel-spark/src/test/resources/testrdd.txt
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
+foo bar
+baz qux
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/5f252c44/components/camel-spark/testrdd.txt
----------------------------------------------------------------------
diff --git a/components/camel-spark/testrdd.txt b/components/camel-spark/testrdd.txt
deleted file mode 100644
index 5bb464c..0000000
--- a/components/camel-spark/testrdd.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-
-foo bar
-baz qux
\ No newline at end of file