You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2018/03/19 14:29:45 UTC
ignite git commit: IGNITE-7816: Fixing Spark examples tests. - Fixes
#3590.
Repository: ignite
Updated Branches:
refs/heads/master 68502b0a6 -> ce6a15782
IGNITE-7816: Fixing Spark examples tests. - Fixes #3590.
Signed-off-by: Nikolay Izhikov <ni...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce6a1578
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce6a1578
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce6a1578
Branch: refs/heads/master
Commit: ce6a15782c93a95c58ccb46c44f391b39d4c4ac9
Parents: 68502b0
Author: Nikolay Izhikov <ni...@apache.org>
Authored: Mon Mar 19 16:56:34 2018 +0300
Committer: Nikolay Izhikov <ni...@apache.org>
Committed: Mon Mar 19 16:56:34 2018 +0300
----------------------------------------------------------------------
.../ignite/examples/spark/IgniteDataFrameWriteExample.scala | 4 +++-
.../apache/ignite/spark/examples/IgniteDataFrameSelfTest.java | 3 ++-
.../apache/ignite/spark/examples/SharedRDDExampleSelfTest.java | 3 ++-
.../spark/testsuites/IgniteExamplesSparkSelfTestSuite.java | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce6a1578/examples/src/main/spark/org/apache/ignite/examples/spark/IgniteDataFrameWriteExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/spark/org/apache/ignite/examples/spark/IgniteDataFrameWriteExample.scala b/examples/src/main/spark/org/apache/ignite/examples/spark/IgniteDataFrameWriteExample.scala
index 7662fb4..333ff41 100644
--- a/examples/src/main/spark/org/apache/ignite/examples/spark/IgniteDataFrameWriteExample.scala
+++ b/examples/src/main/spark/org/apache/ignite/examples/spark/IgniteDataFrameWriteExample.scala
@@ -21,6 +21,7 @@ import java.lang.{Long ⇒ JLong, String ⇒ JString}
import org.apache.ignite.cache.query.SqlFieldsQuery
import org.apache.ignite.configuration.CacheConfiguration
+import org.apache.ignite.internal.util.IgniteUtils.resolveIgnitePath
import org.apache.ignite.{Ignite, Ignition}
import org.apache.log4j.{Level, Logger}
import org.apache.spark.sql.{SaveMode, SparkSession}
@@ -70,7 +71,8 @@ object IgniteDataFrameWriteExample extends App {
def writeJSonToIgnite(implicit spark: SparkSession): Unit = {
//Load content of json file to data frame.
- val personsDataFrame = spark.read.json("examples/src/main/resources/person.json")
+ val personsDataFrame = spark.read.json(
+ resolveIgnitePath("examples/src/main/resources/person.json").getAbsolutePath)
println()
println("Json file content:")
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce6a1578/examples/src/test/spark/org/apache/ignite/spark/examples/IgniteDataFrameSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/spark/org/apache/ignite/spark/examples/IgniteDataFrameSelfTest.java b/examples/src/test/spark/org/apache/ignite/spark/examples/IgniteDataFrameSelfTest.java
index f9f1d64..865dd54 100644
--- a/examples/src/test/spark/org/apache/ignite/spark/examples/IgniteDataFrameSelfTest.java
+++ b/examples/src/test/spark/org/apache/ignite/spark/examples/IgniteDataFrameSelfTest.java
@@ -20,11 +20,12 @@ package org.apache.ignite.spark.examples;
import org.apache.ignite.examples.spark.IgniteCatalogExample;
import org.apache.ignite.examples.spark.IgniteDataFrameExample;
import org.apache.ignite.examples.spark.IgniteDataFrameWriteExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
import org.junit.Test;
/**
*/
-public class IgniteDataFrameSelfTest {
+public class IgniteDataFrameSelfTest extends GridAbstractExamplesTest {
static final String[] EMPTY_ARGS = new String[0];
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce6a1578/examples/src/test/spark/org/apache/ignite/spark/examples/SharedRDDExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/spark/org/apache/ignite/spark/examples/SharedRDDExampleSelfTest.java b/examples/src/test/spark/org/apache/ignite/spark/examples/SharedRDDExampleSelfTest.java
index 038202e..9d4be15 100644
--- a/examples/src/test/spark/org/apache/ignite/spark/examples/SharedRDDExampleSelfTest.java
+++ b/examples/src/test/spark/org/apache/ignite/spark/examples/SharedRDDExampleSelfTest.java
@@ -18,12 +18,13 @@
package org.apache.ignite.spark.examples;
import org.apache.ignite.examples.spark.SharedRDDExample;
+import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
import org.junit.Test;
/**
* SharedRDD examples self test.
*/
-public class SharedRDDExampleSelfTest {
+public class SharedRDDExampleSelfTest extends GridAbstractExamplesTest {
static final String[] EMPTY_ARGS = new String[0];
/**
* @throws Exception If failed.
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce6a1578/examples/src/test/spark/org/apache/ignite/spark/testsuites/IgniteExamplesSparkSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/spark/org/apache/ignite/spark/testsuites/IgniteExamplesSparkSelfTestSuite.java b/examples/src/test/spark/org/apache/ignite/spark/testsuites/IgniteExamplesSparkSelfTestSuite.java
index 9e1b2df..df1a243 100644
--- a/examples/src/test/spark/org/apache/ignite/spark/testsuites/IgniteExamplesSparkSelfTestSuite.java
+++ b/examples/src/test/spark/org/apache/ignite/spark/testsuites/IgniteExamplesSparkSelfTestSuite.java
@@ -38,7 +38,7 @@ public class IgniteExamplesSparkSelfTestSuite extends TestSuite {
System.setProperty(IGNITE_OVERRIDE_MCAST_GRP,
GridTestUtils.getNextMulticastGroup(IgniteExamplesSparkSelfTestSuite.class));
- TestSuite suite = new TestSuite("Ignite Examples Test Suite");
+ TestSuite suite = new TestSuite("Ignite Spark Examples Test Suite");
suite.addTest(new TestSuite(SharedRDDExampleSelfTest.class));
suite.addTest(new TestSuite(IgniteDataFrameSelfTest.class));