Merge pull request scala-js#1528 from sjrd/thread-name

sjrd · sjrd · commit 48e96ccbade4 · 2015-03-13T09:32:36.000+01:00
Fix scala-js#1526: Implement java.lang.Thread.{get,set}Name.
diff --git a/javalanglib/src/main/scala/java/lang/Thread.scala b/javalanglib/src/main/scala/java/lang/Thread.scala
@@ -6,8 +6,16 @@ package java.lang
  * So we use a binary signature that no Java source file can ever produce.
  */
 class Thread private (dummy: Unit) extends Runnable {
+  private[this] var name: String = "main" // default name of the main thread
+
   def run(): Unit = ()
 
+  final def setName(name: String): Unit =
+    this.name = name
+
+  final def getName(): String =
+    this.name
+
   def getStackTrace(): Array[StackTraceElement] =
     scala.scalajs.runtime.StackTrace.getCurrentStackTrace()
 }
diff --git a/test-suite/src/test/scala/org/scalajs/testsuite/javalib/ThreadTest.scala b/test-suite/src/test/scala/org/scalajs/testsuite/javalib/ThreadTest.scala
@@ -14,6 +14,18 @@ import org.scalajs.jasminetest.JasmineTest
 object ThreadTest extends JasmineTest {
 
   describe("java.lang.Thread") {
+    it("getName and setName") {
+      val t = Thread.currentThread()
+      expect(t.getName).toBe("main") // default name of the main thread
+      t.setName("foo")
+      try {
+        expect(t.getName).toBe("foo")
+      } finally {
+        t.setName("main") // don't pollute the rest of the world with this test
+      }
+      expect(t.getName).toBe("main")
+    }
+
     it("Thread.currentThread().getStackTrace() should exist and not crash") {
       java.lang.Thread.currentThread().getStackTrace()
     }
