Added tests for run-mode property modification.

lift · Jul 6, 2013 · aad79b5 · aad79b5
1 parent 6d70b8d
commit aad79b5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/core/util/src/main/scala/net/liftweb/util/Props.scala b/core/util/src/main/scala/net/liftweb/util/Props.scala
@@ -120,7 +120,7 @@ object Props extends Logger {
     }
   }
 
-  @volatile private var runModeInitialised: Boolean = false
+  @volatile private[util] var runModeInitialised: Boolean = false
 
   /**
    * Exposes a property affecting run-mode determination, for customisation. If the property is modified

diff --git a/core/util/src/test/scala/net/liftweb/util/PropsSpec.scala b/core/util/src/test/scala/net/liftweb/util/PropsSpec.scala
@@ -18,17 +18,38 @@ package net.liftweb
 package util
 
 import org.specs2.mutable.Specification
-
+import Props.RunModes._
 
 /**
  * Systems under specification for Lift Mailer.
  */
 object PropsSpec extends Specification {
   "Props Specification".title
+  sequential
 
   "Props" should {
     "Detect test mode correctly" in {
       Props.testMode must_== true
     }
+
+    "Allow modification of run-mode properties before the run-mode is set" in {
+      val before = Props.autoDetectRunModeFn.get
+      try {
+        Props.runModeInitialised = false
+        Props.autoDetectRunModeFn.allowModification must_== true
+        Props.autoDetectRunModeFn.set(() => Test) must_== true
+        Props.autoDetectRunModeFn.get must_!= before
+      } finally {
+        Props.autoDetectRunModeFn.set(before)
+        Props.runModeInitialised = true
+      }
+    }
+
+    "Prohibit modification of run-mode properties when the run-mode is set" in {
+      val before = Props.autoDetectRunModeFn.get
+      Props.autoDetectRunModeFn.allowModification must_== false
+      Props.autoDetectRunModeFn.set(() => Test) must_== false
+      Props.autoDetectRunModeFn.get must_== before
+    }
   }
 }