diff --git a/core/src/test/resources/HistoryServerExpectations/applications/expectation.json b/core/src/test/resources/HistoryServerExpectations/application_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/expectation.json rename to core/src/test/resources/HistoryServerExpectations/application_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages__q__status__e__complete/expectation.json b/core/src/test/resources/HistoryServerExpectations/complete_stage_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages__q__status__e__complete/expectation.json rename to core/src/test/resources/HistoryServerExpectations/complete_stage_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications__q__status__e__completed/expectation.json b/core/src/test/resources/HistoryServerExpectations/completed_app_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications__q__status__e__completed/expectation.json rename to core/src/test/resources/HistoryServerExpectations/completed_app_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/executors/expectation.json b/core/src/test/resources/HistoryServerExpectations/executor_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/executors/expectation.json rename to core/src/test/resources/HistoryServerExpectations/executor_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages__q__status__e__failed/expectation.json b/core/src/test/resources/HistoryServerExpectations/failed_stage_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages__q__status__e__failed/expectation.json rename to core/src/test/resources/HistoryServerExpectations/failed_stage_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/jobs/expectation.json b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/jobs/expectation.json rename to core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/jobs/expectation.json b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/jobs/expectation.json rename to core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/expectation.json b/core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/expectation.json rename to core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications__q__maxDate__e__2015-02-03T10:42:40.000CST/expectation.json b/core/src/test/resources/HistoryServerExpectations/maxDate2_app_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications__q__maxDate__e__2015-02-03T10:42:40.000CST/expectation.json rename to core/src/test/resources/HistoryServerExpectations/maxDate2_app_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications__q__maxDate__e__2015-02-10/expectation.json b/core/src/test/resources/HistoryServerExpectations/maxDate_app_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications__q__maxDate__e__2015-02-10/expectation.json rename to core/src/test/resources/HistoryServerExpectations/maxDate_app_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications__q__minDate__e__2015-02-10/expectation.json b/core/src/test/resources/HistoryServerExpectations/minDate_app_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications__q__minDate__e__2015-02-10/expectation.json rename to core/src/test/resources/HistoryServerExpectations/minDate_app_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/expectation.json b/core/src/test/resources/HistoryServerExpectations/one_app_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/expectation.json rename to core/src/test/resources/HistoryServerExpectations/one_app_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/expectation.json b/core/src/test/resources/HistoryServerExpectations/one_app_multi_attempt_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/expectation.json rename to core/src/test/resources/HistoryServerExpectations/one_app_multi_attempt_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/0/expectation.json b/core/src/test/resources/HistoryServerExpectations/one_job_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/0/expectation.json rename to core/src/test/resources/HistoryServerExpectations/one_job_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/0/expectation.json b/core/src/test/resources/HistoryServerExpectations/one_rdd_storage_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/0/expectation.json rename to core/src/test/resources/HistoryServerExpectations/one_rdd_storage_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/expectation.json b/core/src/test/resources/HistoryServerExpectations/one_stage_attempt_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/expectation.json rename to core/src/test/resources/HistoryServerExpectations/one_stage_attempt_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/expectation.json b/core/src/test/resources/HistoryServerExpectations/one_stage_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/expectation.json rename to core/src/test/resources/HistoryServerExpectations/one_stage_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/expectation.json b/core/src/test/resources/HistoryServerExpectations/rdd_list_storage_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/expectation.json rename to core/src/test/resources/HistoryServerExpectations/rdd_list_storage_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications__q__status__e__running/expectation.json b/core/src/test/resources/HistoryServerExpectations/running_app_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications__q__status__e__running/expectation.json rename to core/src/test/resources/HistoryServerExpectations/running_app_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_list_with_accumulable_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_list_with_accumulable_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_task_list_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_task_list_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/taskList/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_task_list_from_multi_attempt_app_json_1__expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/taskList/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_task_list_from_multi_attempt_app_json_1__expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/stages/0/0/taskList/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_task_list_from_multi_attempt_app_json_2__expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/stages/0/0/taskList/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_task_list_from_multi_attempt_app_json_2__expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__offset__e__10&length__e__50/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_task_list_w__offset___length_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__offset__e__10&length__e__50/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_task_list_w__offset___length_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__-runtime/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_task_list_w__sortBy_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__-runtime/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_task_list_w__sortBy_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__DECREASING_RUNTIME/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_task_list_w__sortBy_short_names___runtime_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__DECREASING_RUNTIME/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_task_list_w__sortBy_short_names___runtime_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__runtime/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_task_list_w__sortBy_short_names__runtime_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__runtime/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_task_list_w__sortBy_short_names__runtime_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_task_summary_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_task_summary_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary__q__quantiles__e__0.01,0.5,0.99/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_task_summary_w__custom_quantiles_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary__q__quantiles__e__0.01,0.5,0.99/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_task_summary_w__custom_quantiles_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/expectation.json b/core/src/test/resources/HistoryServerExpectations/stage_with_accumulable_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/expectation.json rename to core/src/test/resources/HistoryServerExpectations/stage_with_accumulable_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs__q__status__e__succeeded&status__e__failed/expectation.json b/core/src/test/resources/HistoryServerExpectations/succeeded_failed_job_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs__q__status__e__succeeded&status__e__failed/expectation.json rename to core/src/test/resources/HistoryServerExpectations/succeeded_failed_job_list_json_expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs__q__status__e__succeeded/expectation.json b/core/src/test/resources/HistoryServerExpectations/succeeded_job_list_json_expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs__q__status__e__succeeded/expectation.json rename to core/src/test/resources/HistoryServerExpectations/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 index cd8680a774314..9077b0bd95ce9 100644 --- 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 = {