diff --git a/core/src/test/resources/HistoryServerExpectations/applications/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/executors/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/executors/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/executors/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/executors/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/0/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/0/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/0/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded&status=failed/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs__q__status__e__succeeded&status__e__failed/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded&status=failed/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs__q__status__e__succeeded&status__e__failed/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs__q__status__e__succeeded/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs?status=succeeded/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/jobs__q__status__e__succeeded/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/0/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/1/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=complete/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages__q__status__e__complete/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=complete/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages__q__status__e__complete/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=failed/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages__q__status__e__failed/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages?status=failed/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/stages__q__status__e__failed/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/0/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/0/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/0/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1422981780767/storage/rdd/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/jobs/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/jobs/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/jobs/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/jobs/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/taskList/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/taskList/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/taskList/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/0/0/taskList/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/1/stages/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/jobs/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/jobs/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/jobs/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/jobs/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/stages/0/0/taskList/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/stages/0/0/taskList/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/stages/0/0/taskList/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/2/stages/0/0/taskList/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1426533911241/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?offset=10&length=50/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__offset__e__10&length__e__50/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?offset=10&length=50/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__offset__e__10&length__e__50/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=-runtime/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__-runtime/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=-runtime/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__-runtime/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=DECREASING_RUNTIME/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__DECREASING_RUNTIME/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=DECREASING_RUNTIME/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__DECREASING_RUNTIME/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=runtime/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__runtime/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList?sortBy=runtime/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskList__q__sortBy__e__runtime/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary?quantiles=0.01,0.5,0.99/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary__q__quantiles__e__0.01,0.5,0.99/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary?quantiles=0.01,0.5,0.99/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications/local-1427397477963/stages/20/0/taskSummary__q__quantiles__e__0.01,0.5,0.99/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-03T10:42:40.000CST/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications__q__maxDate__e__2015-02-03T10:42:40.000CST/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-03T10:42:40.000CST/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications__q__maxDate__e__2015-02-03T10:42:40.000CST/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-10/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications__q__maxDate__e__2015-02-10/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications?maxDate=2015-02-10/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications__q__maxDate__e__2015-02-10/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications?minDate=2015-02-10/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications__q__minDate__e__2015-02-10/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications?minDate=2015-02-10/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications__q__minDate__e__2015-02-10/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications?status=completed/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications__q__status__e__completed/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications?status=completed/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications__q__status__e__completed/expectation.json diff --git a/core/src/test/resources/HistoryServerExpectations/applications?status=running/json_expectation b/core/src/test/resources/HistoryServerExpectations/applications__q__status__e__running/expectation.json similarity index 100% rename from core/src/test/resources/HistoryServerExpectations/applications?status=running/json_expectation rename to core/src/test/resources/HistoryServerExpectations/applications__q__status__e__running/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 0744b68c695f9..cd8680a774314 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, path + "/json_expectation"))) + new File(expRoot, HistoryServerSuite.sanitizePath(path) + "/expectation.json"))) // compare the ASTs so formatting differences don't cause failures import org.json4s._ import org.json4s.jackson.JsonMethods._ @@ -204,9 +204,9 @@ class HistoryServerSuite extends FunSuite with BeforeAndAfter with Matchers with def generateExpectation(path: String): Unit = { val json = getUrl(path) - val dir = new File(expRoot, path) + val dir = new File(expRoot, HistoryServerSuite.sanitizePath(path)) dir.mkdirs() - val out = new FileWriter(new File(dir, "json_expectation")) + val out = new FileWriter(new File(dir, "expectation.json")) out.write(json) out.close() } @@ -237,19 +237,29 @@ 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 } (code, inString, errString) } + + def sanitizePath(path: String): String = { + // this doesn't need to be perfect, just good enough to avoid collisions + path.replaceAll("""\?""", "__q__").replaceAll("=","__e__") + } + def getUrl(path: URL): String = { val (code, resultOpt, error) = getContentAndCode(path) if (code == 200) {