aboutsummaryrefslogtreecommitdiff
path: root/core/src/test
diff options
context:
space:
mode:
authorDaoyuan <daoyuan.wang@intel.com>2014-07-14 10:40:44 -0700
committerReynold Xin <rxin@apache.org>2014-07-14 10:40:44 -0700
commit38ccd6ebd412cfbf82ae9d8a0998ff697db11455 (patch)
tree0f8ae898c9ced5cbeac163684199f505541257cd /core/src/test
parentaab5349660109481ee944721d611771da5a93109 (diff)
downloadspark-38ccd6ebd412cfbf82ae9d8a0998ff697db11455.tar.gz
spark-38ccd6ebd412cfbf82ae9d8a0998ff697db11455.tar.bz2
spark-38ccd6ebd412cfbf82ae9d8a0998ff697db11455.zip
move some test file to match src code
Just move some test suite to corresponding package Author: Daoyuan <daoyuan.wang@intel.com> Closes #1401 from adrian-wang/movetestfiles and squashes the following commits: d1a6803 [Daoyuan] move some test file to match src code
Diffstat (limited to 'core/src/test')
-rw-r--r--core/src/test/scala/org/apache/spark/broadcast/BroadcastSuite.scala (renamed from core/src/test/scala/org/apache/spark/BroadcastSuite.scala)8
-rw-r--r--core/src/test/scala/org/apache/spark/network/ConnectionManagerSuite.scala (renamed from core/src/test/scala/org/apache/spark/ConnectionManagerSuite.scala)11
-rw-r--r--core/src/test/scala/org/apache/spark/rdd/PipedRDDSuite.scala (renamed from core/src/test/scala/org/apache/spark/PipedRDDSuite.scala)14
-rw-r--r--core/src/test/scala/org/apache/spark/rdd/ZippedPartitionsSuite.scala (renamed from core/src/test/scala/org/apache/spark/ZippedPartitionsSuite.scala)3
-rw-r--r--core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala (renamed from core/src/test/scala/org/apache/spark/AkkaUtilsSuite.scala)8
5 files changed, 19 insertions, 25 deletions
diff --git a/core/src/test/scala/org/apache/spark/BroadcastSuite.scala b/core/src/test/scala/org/apache/spark/broadcast/BroadcastSuite.scala
index c9936256a5..7c3d0208b1 100644
--- a/core/src/test/scala/org/apache/spark/BroadcastSuite.scala
+++ b/core/src/test/scala/org/apache/spark/broadcast/BroadcastSuite.scala
@@ -15,14 +15,12 @@
* limitations under the License.
*/
-package org.apache.spark
+package org.apache.spark.broadcast
+import org.apache.spark.storage.{BroadcastBlockId, _}
+import org.apache.spark.{LocalSparkContext, SparkConf, SparkContext, SparkException}
import org.scalatest.FunSuite
-import org.apache.spark.storage._
-import org.apache.spark.broadcast.{Broadcast, HttpBroadcast}
-import org.apache.spark.storage.BroadcastBlockId
-
class BroadcastSuite extends FunSuite with LocalSparkContext {
private val httpConf = broadcastConf("HttpBroadcastFactory")
diff --git a/core/src/test/scala/org/apache/spark/ConnectionManagerSuite.scala b/core/src/test/scala/org/apache/spark/network/ConnectionManagerSuite.scala
index df6b2604c8..415ad8c432 100644
--- a/core/src/test/scala/org/apache/spark/ConnectionManagerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/network/ConnectionManagerSuite.scala
@@ -15,15 +15,14 @@
* limitations under the License.
*/
-package org.apache.spark
-
-import org.scalatest.FunSuite
+package org.apache.spark.network
import java.nio._
-import org.apache.spark.network.{ConnectionManager, Message, ConnectionManagerId}
-import scala.concurrent.Await
-import scala.concurrent.TimeoutException
+import org.apache.spark.{SecurityManager, SparkConf}
+import org.scalatest.FunSuite
+
+import scala.concurrent.{Await, TimeoutException}
import scala.concurrent.duration._
import scala.language.postfixOps
diff --git a/core/src/test/scala/org/apache/spark/PipedRDDSuite.scala b/core/src/test/scala/org/apache/spark/rdd/PipedRDDSuite.scala
index db56a4acdd..be972c5e97 100644
--- a/core/src/test/scala/org/apache/spark/PipedRDDSuite.scala
+++ b/core/src/test/scala/org/apache/spark/rdd/PipedRDDSuite.scala
@@ -15,25 +15,21 @@
* limitations under the License.
*/
-package org.apache.spark
+package org.apache.spark.rdd
import java.io.File
-import org.scalatest.FunSuite
-
-import org.apache.spark.rdd.{HadoopRDD, PipedRDD, HadoopPartition}
-import org.apache.hadoop.mapred.{JobConf, TextInputFormat, FileSplit}
import org.apache.hadoop.fs.Path
+import org.apache.hadoop.io.{LongWritable, Text}
+import org.apache.hadoop.mapred.{FileSplit, JobConf, TextInputFormat}
+import org.apache.spark._
+import org.scalatest.FunSuite
import scala.collection.Map
import scala.language.postfixOps
import scala.sys.process._
import scala.util.Try
-import org.apache.hadoop.io.{Text, LongWritable}
-
-import org.apache.spark.executor.TaskMetrics
-
class PipedRDDSuite extends FunSuite with SharedSparkContext {
test("basic pipe") {
diff --git a/core/src/test/scala/org/apache/spark/ZippedPartitionsSuite.scala b/core/src/test/scala/org/apache/spark/rdd/ZippedPartitionsSuite.scala
index 4f87fd8654..72596e8686 100644
--- a/core/src/test/scala/org/apache/spark/ZippedPartitionsSuite.scala
+++ b/core/src/test/scala/org/apache/spark/rdd/ZippedPartitionsSuite.scala
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.spark
+package org.apache.spark.rdd
+import org.apache.spark.SharedSparkContext
import org.scalatest.FunSuite
object ZippedPartitionsSuite {
diff --git a/core/src/test/scala/org/apache/spark/AkkaUtilsSuite.scala b/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala
index 4ab870e751..c4765e53de 100644
--- a/core/src/test/scala/org/apache/spark/AkkaUtilsSuite.scala
+++ b/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.spark
-
-import org.scalatest.FunSuite
+package org.apache.spark.util
import akka.actor._
+import org.apache.spark._
import org.apache.spark.scheduler.MapStatus
import org.apache.spark.storage.BlockManagerId
-import org.apache.spark.util.AkkaUtils
+import org.scalatest.FunSuite
+
import scala.concurrent.Await
/**