Skip to content

Commit

Permalink
fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Apr 6, 2023
1 parent bf04582 commit 11417b7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,9 @@ trait WebSocketSpecMethods extends PlaySpecification with WsTestClient with Serv
currentApp.set(app)
val testServer = TestServer(testServerPort, app)
val configuredTestServer =
testServer.copy(config = testServer.config.copy(configuration = testServer.config.configuration ++ config))
testServer.copy(config =
testServer.config.copy(configuration = testServer.config.configuration.withFallback(config))
)
running(configuredTestServer)(block(app))
}

Expand Down
2 changes: 1 addition & 1 deletion testkit/play-test/src/test/java/play/test/HelpersTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public void shouldSuccessfullyExecutePostRequestWithEmptyBody() {
@Test
public void shouldSuccessfullyExecutePostRequestWithMultipartFormData() {
Application app = Helpers.fakeApplication();
Map<String, String[]> postParams = new java.util.HashMap();
Map<String, String[]> postParams = new java.util.HashMap<>();
postParams.put("key", new String[] {"value"});
Http.RequestBuilder request =
new Http.RequestBuilder().method(POST).bodyMultipart(postParams, Collections.emptyList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import scala.util.Failure
import scala.util.Success
import scala.util.Try

import com.google.common.io.{ Files => GFiles }
import org.specs2.mutable.Specification
import play.api.Mode
import play.api.Play
Expand Down Expand Up @@ -90,7 +89,7 @@ class ProdServerStartSpec extends Specification {
sequential

def withTempDir[T](block: File => T) = {
val temp = GFiles.createTempDir()
val temp = Files.createTempDirectory("tmp").toFile
try {
block(temp)
} finally {
Expand Down

0 comments on commit 11417b7

Please sign in to comment.