From ffda06b531175b662b1ce15a9efb802612a98c98 Mon Sep 17 00:00:00 2001 From: Pathikrit Bhowmick Date: Mon, 13 Feb 2017 01:07:06 -0500 Subject: [PATCH] #9: File.resource util --- core/src/main/scala/better/files/File.scala | 4 ++-- core/src/test/scala/better/files/FileSpec.scala | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/better/files/File.scala b/core/src/main/scala/better/files/File.scala index c8c14f65..62692f66 100644 --- a/core/src/main/scala/better/files/File.scala +++ b/core/src/main/scala/better/files/File.scala @@ -862,8 +862,8 @@ class File private(val path: Path) { object File { implicit val defaultCharset: Charset = Charset.defaultCharset() - def charset(name: String): Charset = - Charset.forName(name) + def resource(name: String): File = + File(Thread.currentThread().getContextClassLoader.getResource(name)) def newTemporaryDirectory(prefix: String = "", parent: Option[File] = None)(implicit attributes: Attributes = Attributes.default): File = { parent match { diff --git a/core/src/test/scala/better/files/FileSpec.scala b/core/src/test/scala/better/files/FileSpec.scala index 4fe1cb2b..bf9db057 100644 --- a/core/src/test/scala/better/files/FileSpec.scala +++ b/core/src/test/scala/better/files/FileSpec.scala @@ -17,8 +17,6 @@ class FileSpec extends FlatSpec with BeforeAndAfterEach with Matchers { case _ => false } - def resource(name: String) = File(Thread.currentThread().getContextClassLoader.getResource(name)) - def sleep(t: FiniteDuration = 2 second) = Thread.sleep(t.toMillis) var testRoot: File = _ //TODO: Get rid of mutable test vars @@ -498,7 +496,7 @@ class FileSpec extends FlatSpec with BeforeAndAfterEach with Matchers { } it should "handle BOM" in { - val file = resource("file_with_bom.txt") + val file = File.resource("file_with_bom.txt") val expectedContent = "I contain an offending UTF-8 BOM\n" file.contentAsString should not equal expectedContent file.contentAsString(charset = UnicodeDecoder("UTF-8")) shouldEqual expectedContent