Merge branch 'cheeseng-prop-config-deprecations-removal' into 3.1.x

Author: bvenners

scalatest-test/src/test/scala/org/scalatest/prop/ConfigurationSuite.scala

@@ -32,22 +32,6 @@ class ConfigurationSuite extends FunSuite with Matchers {
     minSuccessful(5678).value.value should be (5678)
   }
 
-  test("maxDiscarded throws IAE if less than 0") {
-    intercept[IllegalArgumentException] {
-      maxDiscarded(-1)
-    }
-    intercept[IllegalArgumentException] {
-      maxDiscarded(-2)
-    }
-  }
-
-  test("maxDiscarded value is passed value, if valid") {
-      maxDiscarded(0).value should be (0)
-      maxDiscarded(1).value should be (1)
-      maxDiscarded(2).value should be (2)
-      maxDiscarded(5678).value should be (5678)
-  }
-
   test("maxDiscardedFactor should not compile if less than 0 or a non-double") {
     "maxDiscardedFactor(-0.1)" shouldNot compile
     "maxDiscardedFactor(-100.0)" shouldNot compile
@@ -73,22 +57,6 @@ class ConfigurationSuite extends FunSuite with Matchers {
     minSize(5678).value.value should be (5678)
   }
 
-  test("maxSize throws IAE if less than 0") {
-    intercept[IllegalArgumentException] {
-      maxSize(-1)
-    }
-    intercept[IllegalArgumentException] {
-      maxSize(-2)
-    }
-  }
-
-  test("maxSize value is passed value, if valid") {
-      maxSize(0).value should be (0)
-      maxSize(1).value should be (1)
-      maxSize(2).value should be (2)
-      maxSize(5678).value should be (5678)
-  }
-
   test("sizeRange should not compile if less than 0") {
     "sizeRange(-1)" shouldNot compile
     "sizeRange(-2)" shouldNot compile

scalatest-test/src/test/scala/org/scalatest/prop/OverrideImplicitConfigurationSuite.scala

@@ -3,31 +3,13 @@ package org.scalatest.prop
 import org.scalatest._
 
 trait GetImplicitConfig { self: Configuration =>
-  def getImplicitConfig()(implicit config: PropertyCheckConfigurable): PropertyCheckConfiguration = config.asPropertyCheckConfiguration
-}
-
-class ConfigImplicitOverrideInClassTest extends FunSuite with Matchers with Configuration with GetImplicitConfig {
-  implicit val classImplicit = PropertyCheckConfig(minSuccessful = 42)
-  test("config implicit override in class") {
-    assert(getImplicitConfig().minSuccessful.value == 42)
-  }
-}
-
-class ConfigImplicitOverrideInTestTest extends FunSuite with Matchers with Configuration with GetImplicitConfig {
-  /*
-  // Fails to compile:
-  //  could not find implicit value for parameter config: ConfigImplicitOverrideInTestTest.this.PropertyCheckConfiguration
-  test("config implicit override in test") {
-    implicit val generatorDrivenConfig = PropertyCheckConfig(minSuccessful = 42)
-    assert(getImplicitConfig().minSuccessful.value == 42)
-  }
-  */
+  def getImplicitConfig()(implicit config: PropertyCheckConfiguration): PropertyCheckConfiguration = config
 }
 
 class ConfigExplicitOverrideInClass extends FunSuite with Matchers with Configuration with GetImplicitConfig {
   // Note: Needs PropertyCheckConfiguration type ascription to compile, otherwise compile failure:
   //    could not find implicit value for parameter config: ConfigExplicitOverrideInClass.this.PropertyCheckConfiguration
-  override implicit val generatorDrivenConfig: PropertyCheckConfiguration = PropertyCheckConfig(minSuccessful = 42)
+  override implicit val generatorDrivenConfig: PropertyCheckConfiguration = PropertyCheckConfiguration(minSuccessful = 42)
   test("config explicit override in class") {
     assert(getImplicitConfig().minSuccessful.value == 42)
   }

scalatest-test/src/test/scala/org/scalatest/prop/PropertyCheckConfigParamSuite.scala

@@ -40,22 +40,6 @@ class PropertyCheckConfigParamSuite extends FunSuite with Matchers {
     MinSuccessful(5678).value.value should be (5678)
   }
 
-  test("maxDiscarded throws IAE if less than 0") {
-    intercept[IllegalArgumentException] {
-      MaxDiscarded(-1)
-    }
-    intercept[IllegalArgumentException] {
-      MaxDiscarded(-2)
-    }
-  }
-
-  test("maxDiscarded value is passed value, if valid") {
-      MaxDiscarded(0).value should be (0)
-      MaxDiscarded(1).value should be (1)
-      MaxDiscarded(2).value should be (2)
-      MaxDiscarded(5678).value should be (5678)
-  }
-
   test("maxDiscardedFactor value is passed value, if valid") {
     MaxDiscardedFactor(1.0).value.value should be (1.0)
     MaxDiscardedFactor(1.5).value.value should be (1.5)
@@ -78,22 +62,6 @@ class PropertyCheckConfigParamSuite extends FunSuite with Matchers {
     MinSize(5678).value.value should be (5678)
   }
 
-  test("maxSize throws IAE if less than 0") {
-    intercept[IllegalArgumentException] {
-      MaxSize(-1)
-    }
-    intercept[IllegalArgumentException] {
-      MaxSize(-2)
-    }
-  }
-
-  test("maxSize value is passed value, if valid") {
-      MaxSize(0).value should be (0)
-      MaxSize(1).value should be (1)
-      MaxSize(2).value should be (2)
-      MaxSize(5678).value should be (5678)
-  }
-
   test("sizeRange should not compile if less than 0") {
     "SizeRange(-1)" shouldNot compile
     "SizeRange(-2)" shouldNot compile