just use test case name for expectation file name

maropu · May 6, 2015 · 4e12013 · 4e12013
1 parent 863ef64
commit 4e12013
Show file tree

Hide file tree

Showing 34 changed files with 9 additions and 14 deletions.
diff --git a/...xpectations/applications/expectation.json → ...ns/application_list_json_expectation.json b/...xpectations/applications/expectation.json → ...ns/application_list_json_expectation.json
diff --git a/...__q__status__e__complete/expectation.json → ...complete_stage_list_json_expectation.json b/...__q__status__e__complete/expectation.json → ...complete_stage_list_json_expectation.json
diff --git a/..._q__status__e__completed/expectation.json → .../completed_app_list_json_expectation.json b/..._q__status__e__completed/expectation.json → .../completed_app_list_json_expectation.json
diff --git a/...-1422981780767/executors/expectation.json → ...tions/executor_list_json_expectation.json b/...-1422981780767/executors/expectation.json → ...tions/executor_list_json_expectation.json
diff --git a/...es__q__status__e__failed/expectation.json → ...s/failed_stage_list_json_expectation.json b/...es__q__status__e__failed/expectation.json → ...s/failed_stage_list_json_expectation.json
diff --git a/...cal-1426533911241/1/jobs/expectation.json → ...ulti_attempt_app_json_1__expectation.json b/...cal-1426533911241/1/jobs/expectation.json → ...ulti_attempt_app_json_1__expectation.json
diff --git a/...cal-1426533911241/2/jobs/expectation.json → ...ulti_attempt_app_json_2__expectation.json b/...cal-1426533911241/2/jobs/expectation.json → ...ulti_attempt_app_json_2__expectation.json
diff --git a/...local-1422981780767/jobs/expectation.json → ...pectations/job_list_json_expectation.json b/...local-1422981780767/jobs/expectation.json → ...pectations/job_list_json_expectation.json
diff --git a/...15-02-03T10:42:40.000CST/expectation.json → ...s/maxDate2_app_list_json_expectation.json b/...15-02-03T10:42:40.000CST/expectation.json → ...s/maxDate2_app_list_json_expectation.json
diff --git a/...__maxDate__e__2015-02-10/expectation.json → ...ns/maxDate_app_list_json_expectation.json b/...__maxDate__e__2015-02-10/expectation.json → ...ns/maxDate_app_list_json_expectation.json
diff --git a/...__minDate__e__2015-02-10/expectation.json → ...ns/minDate_app_list_json_expectation.json b/...__minDate__e__2015-02-10/expectation.json → ...ns/minDate_app_list_json_expectation.json
diff --git a/...ions/local-1422981780767/expectation.json → ...xpectations/one_app_json_expectation.json b/...ions/local-1422981780767/expectation.json → ...xpectations/one_app_json_expectation.json
diff --git a/...ions/local-1426533911241/expectation.json → ...e_app_multi_attempt_json_expectation.json b/...ions/local-1426533911241/expectation.json → ...e_app_multi_attempt_json_expectation.json
diff --git a/...cal-1422981780767/jobs/0/expectation.json → ...xpectations/one_job_json_expectation.json b/...cal-1422981780767/jobs/0/expectation.json → ...xpectations/one_job_json_expectation.json
diff --git a/...2981780767/storage/rdd/0/expectation.json → ...ons/one_rdd_storage_json_expectation.json b/...2981780767/storage/rdd/0/expectation.json → ...ons/one_rdd_storage_json_expectation.json
diff --git a/...1422981780767/stages/1/0/expectation.json → ...s/one_stage_attempt_json_expectation.json b/...1422981780767/stages/1/0/expectation.json → ...s/one_stage_attempt_json_expectation.json
diff --git a/...l-1422981780767/stages/1/expectation.json → ...ectations/one_stage_json_expectation.json b/...l-1422981780767/stages/1/expectation.json → ...ectations/one_stage_json_expectation.json
diff --git a/...422981780767/storage/rdd/expectation.json → ...ns/rdd_list_storage_json_expectation.json b/...422981780767/storage/rdd/expectation.json → ...ns/rdd_list_storage_json_expectation.json
diff --git a/...s__q__status__e__running/expectation.json → ...ns/running_app_list_json_expectation.json b/...s__q__status__e__running/expectation.json → ...ns/running_app_list_json_expectation.json
diff --git a/...cal-1422981780767/stages/expectation.json → ...ctations/stage_list_json_expectation.json b/...cal-1422981780767/stages/expectation.json → ...ctations/stage_list_json_expectation.json
diff --git a/...l-1426533911241/1/stages/expectation.json → ...st_with_accumulable_json_expectation.json b/...l-1426533911241/1/stages/expectation.json → ...st_with_accumulable_json_expectation.json
diff --git a/...963/stages/20/0/taskList/expectation.json → ...ctations/stage_task_list_expectation.json b/...963/stages/20/0/taskList/expectation.json → ...ctations/stage_task_list_expectation.json
diff --git a/...41/1/stages/0/0/taskList/expectation.json → ...ulti_attempt_app_json_1__expectation.json b/...41/1/stages/0/0/taskList/expectation.json → ...ulti_attempt_app_json_1__expectation.json
diff --git a/...41/2/stages/0/0/taskList/expectation.json → ...ulti_attempt_app_json_2__expectation.json b/...41/2/stages/0/0/taskList/expectation.json → ...ulti_attempt_app_json_2__expectation.json
diff --git a/...set__e__10&length__e__50/expectation.json → ..._list_w__offset___length_expectation.json b/...set__e__10&length__e__50/expectation.json → ..._list_w__offset___length_expectation.json
diff --git a/...__q__sortBy__e__-runtime/expectation.json → ...tage_task_list_w__sortBy_expectation.json b/...__q__sortBy__e__-runtime/expectation.json → ...tage_task_list_w__sortBy_expectation.json
diff --git a/...y__e__DECREASING_RUNTIME/expectation.json → ...By_short_names___runtime_expectation.json b/...y__e__DECREASING_RUNTIME/expectation.json → ...By_short_names___runtime_expectation.json
diff --git a/...t__q__sortBy__e__runtime/expectation.json → ...tBy_short_names__runtime_expectation.json b/...t__q__sortBy__e__runtime/expectation.json → ...tBy_short_names__runtime_expectation.json
diff --git a/.../stages/20/0/taskSummary/expectation.json → ...tions/stage_task_summary_expectation.json b/.../stages/20/0/taskSummary/expectation.json → ...tions/stage_task_summary_expectation.json
diff --git a/...ntiles__e__0.01,0.5,0.99/expectation.json → ...mary_w__custom_quantiles_expectation.json b/...ntiles__e__0.01,0.5,0.99/expectation.json → ...mary_w__custom_quantiles_expectation.json
diff --git a/...26533911241/1/stages/0/0/expectation.json → ...ge_with_accumulable_json_expectation.json b/...26533911241/1/stages/0/0/expectation.json → ...ge_with_accumulable_json_expectation.json
diff --git a/...ceeded&status__e__failed/expectation.json → ...ded_failed_job_list_json_expectation.json b/...ceeded&status__e__failed/expectation.json → ...ded_failed_job_list_json_expectation.json
diff --git a/..._q__status__e__succeeded/expectation.json → .../succeeded_job_list_json_expectation.json b/..._q__status__e__succeeded/expectation.json → .../succeeded_job_list_json_expectation.json
diff --git a/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala b/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala
@@ -134,7 +134,7 @@ class HistoryServerSuite extends FunSuite with BeforeAndAfter with Matchers with
       errOpt should be (None)
       val json = jsonOpt.get
       val exp = IOUtils.toString(new FileInputStream(
-        new File(expRoot, HistoryServerSuite.sanitizePath(path) + "/expectation.json")))
+        new File(expRoot, HistoryServerSuite.sanitizePath(name) + "_expectation.json")))
       // compare the ASTs so formatting differences don't cause failures
       import org.json4s._
       import org.json4s.jackson.JsonMethods._
@@ -202,11 +202,10 @@ class HistoryServerSuite extends FunSuite with BeforeAndAfter with Matchers with
     HistoryServerSuite.getUrl(new URL(s"http://localhost:$port/json/v1/$path"))
   }
 
-  def generateExpectation(path: String): Unit = {
+  def generateExpectation(name: String, path: String): Unit = {
     val json = getUrl(path)
-    val dir = new File(expRoot, HistoryServerSuite.sanitizePath(path))
-    dir.mkdirs()
-    val out = new FileWriter(new File(dir, "expectation.json"))
+    val file = new File(expRoot, HistoryServerSuite.sanitizePath(name) + "_expectation.json")
+    val out = new FileWriter(file)
     out.write(json)
     out.close()
   }
@@ -222,8 +221,8 @@ object HistoryServerSuite {
     suite.expRoot.mkdirs()
     try {
       suite.init()
-      suite.cases.foreach { case (_, path) =>
-        suite.generateExpectation(path)
+      suite.cases.foreach { case (name, path) =>
+        suite.generateExpectation(name, path)
       }
     } finally {
       suite.stop()
@@ -237,17 +236,13 @@ object HistoryServerSuite {
     val code = connection.getResponseCode()
     val inString = try {
       val in = Option(connection.getInputStream())
-      in.map {
-        IOUtils.toString
-      }
+      in.map(IOUtils.toString)
     } catch {
       case io: IOException => None
     }
     val errString = try {
       val err = Option(connection.getErrorStream())
-      err.map {
-        IOUtils.toString
-      }
+      err.map(IOUtils.toString)
     } catch {
       case io: IOException => None
     }
@@ -257,7 +252,7 @@ object HistoryServerSuite {
 
   def sanitizePath(path: String): String = {
     // this doesn't need to be perfect, just good enough to avoid collisions
-    path.replaceAll("""\?""", "__q__").replaceAll("=","__e__")
+    path.replaceAll("\\W", "_")
   }
 
   def getUrl(path: URL): String = {