Skip to content
Closed
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.spark.deploy.history

import org.scalatest.FunSuite
import org.scalatest.Matchers
import org.scalatest.mock.MockitoSugar
import javax.servlet.http.HttpServletRequest
import org.mockito.Mockito.{when}
import org.apache.hadoop.fs.Path
import org.apache.spark.ui.SparkUI
import scala.collection.mutable
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to reorganize imports. See other files for reference

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure do


class HistoryServerSuite extends FunSuite with Matchers with MockitoSugar {

val historyServer = mock[HistoryServer]
val request = mock[HttpServletRequest]

test("generate history page with relative links") {
val ui = mock[SparkUI]
val link = "/history/app1"
val info = new ApplicationHistoryInfo("app1", "app1", 0, 2, 1, "xxx", true )
when(historyServer.getApplicationList()).thenReturn(Seq(info))
when(ui.basePath).thenReturn(link)
when(historyServer.getProviderConfig()).thenReturn(Map[String, String]())
val page = new HistoryPage(historyServer)

//when
val response = page.render(request)

//then
val links = response \\ "a"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bunch of little style nits: The indentation is off by one here. Also I think the imports could be ordered, with scala import first and separated by a line. Fix the extra space in true ) above. Don't we need to import postfixOps to avoid a compiler warning? Do the historyServer and request have to be members?

Otherwise this looks just fine as a follow-on test.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I compare indentation with FsHistoryProviderSuite and imho its the same, imports will do.
I don't think postfixOps is actually needed here. I will make historyServer and request local variables.

val justHrefs = for {
l <- links
attrs <- l.attribute("href")
} yield (attrs.toString)
justHrefs should contain(link)
}
}