Changed styleName results so that they return the old names. We decided to deactivate

bvenners · bvenners · commit 4be62312f474 · 2019-09-12T21:52:26.000-07:00
the chosen styles feature in 3.1.0, and deprecate styleName. We'll remove styleName a few
years down the road, but just in case somebody used it for anything other than chosen styles,
we may as well continue to return the same results as before.
diff --git a/scalatest-test/src/test/scala/org/scalatest/StyleNameSpec.scala b/scalatest-test/src/test/scala/org/scalatest/StyleNameSpec.scala
diff --git a/scalatest/src/main/scala/org/scalatest/FixtureSuite.scala b/scalatest/src/main/scala/org/scalatest/FixtureSuite.scala
@@ -342,7 +342,7 @@ trait FixtureSuite extends org.scalatest.Suite { thisSuite =>
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  override val styleName: String = "org.scalatest.FixtureSuite"
+  override val styleName: String = "org.scalatest.fixture.Suite"
 }
 
 /*
diff --git a/scalatest/src/main/scala/org/scalatest/featurespec/AnyFeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/featurespec/AnyFeatureSpecLike.scala
@@ -400,7 +400,7 @@ trait AnyFeatureSpecLike extends TestSuite with TestRegistration with Informing
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.featurespec.AnyFeatureSpec"
+  final override val styleName: String = "org.scalatest.FeatureSpec"
     
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/featurespec/AsyncFeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/featurespec/AsyncFeatureSpecLike.scala
@@ -382,7 +382,7 @@ trait AsyncFeatureSpecLike extends AsyncTestSuite with AsyncTestRegistration wit
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.featurespec.AsyncFeatureSpec"
+  final override val styleName: String = "org.scalatest.FeatureSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/featurespec/FixtureAnyFeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/featurespec/FixtureAnyFeatureSpecLike.scala
@@ -433,7 +433,7 @@ trait FixtureAnyFeatureSpecLike extends org.scalatest.FixtureTestSuite with org.
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.featurespec.FixtureAnyFeatureSpec"
+  final override val styleName: String = "org.scalatest.fixture.FeatureSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/featurespec/FixtureAsyncFeatureSpecLike.scala
@@ -399,7 +399,7 @@ trait FixtureAsyncFeatureSpecLike extends org.scalatest.FixtureAsyncTestSuite wi
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.featurespec.FixtureAsyncFeatureSpec"
+  final override val styleName: String = "org.scalatest.fixture.FeatureSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/flatspec/AnyFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/flatspec/AnyFlatSpecLike.scala
@@ -1822,7 +1822,7 @@ import resultOfStringPassedToVerb.verb
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.flatspec.AnyFlatSpec"
+  final override val styleName: String = "org.scalatest.FlatSpec"
     
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/flatspec/AsyncFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/flatspec/AsyncFlatSpecLike.scala
@@ -1838,7 +1838,7 @@ import resultOfStringPassedToVerb.verb
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.flatspec.AsyncFlatSpec"
+  final override val styleName: String = "org.scalatest.FlatSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/flatspec/FixtureAnyFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/flatspec/FixtureAnyFlatSpecLike.scala
@@ -2229,7 +2229,7 @@ import resultOfStringPassedToVerb.verb
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.flatspec.FixtureAnyFlatSpec"
+  final override val styleName: String = "org.scalatest.fixture.FlatSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/flatspec/FixtureAsyncFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/flatspec/FixtureAsyncFlatSpecLike.scala
@@ -2204,7 +2204,7 @@ import resultOfStringPassedToVerb.verb
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.flatspec.FixtureAsyncFlatSpec"
+  final override val styleName: String = "org.scalatest.fixture.FlatSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/freespec/AnyFreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/freespec/AnyFreeSpecLike.scala
@@ -545,7 +545,7 @@ trait AnyFreeSpecLike extends TestSuite with TestRegistration with Informing wit
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.freespec.AnyFreeSpec"
+  final override val styleName: String = "org.scalatest.FreeSpec"
     
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/freespec/AsyncFreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/freespec/AsyncFreeSpecLike.scala
@@ -548,7 +548,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.freespec.AsyncFreeSpec"
+  final override val styleName: String = "org.scalatest.FreeSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/freespec/FixtureAnyFreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/freespec/FixtureAnyFreeSpecLike.scala
@@ -639,7 +639,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.freespec.FixtureAnyFreeSpec"
+  final override val styleName: String = "org.scalatest.fixture.FreeSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/freespec/FixtureAsyncFreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/freespec/FixtureAsyncFreeSpecLike.scala
@@ -616,7 +616,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.freespec.FixtureAsyncFreeSpec"
+  final override val styleName: String = "org.scalatest.fixture.FreeSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/freespec/PathAnyFreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/freespec/PathAnyFreeSpecLike.scala
@@ -660,7 +660,7 @@ trait PathAnyFreeSpecLike extends org.scalatest.Suite with OneInstancePerTest wi
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.freespec.PathAnyFreeSpec"
+  final override val styleName: String = "org.scalatest.path.FreeSpec"
     
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = {
     ensureTestResultsRegistered(thisSuite)
diff --git a/scalatest/src/main/scala/org/scalatest/funspec/AnyFunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/funspec/AnyFunSpecLike.scala
@@ -529,7 +529,7 @@ trait AnyFunSpecLike extends TestSuite with TestRegistration with Informing with
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.funspec.AnyFunSpec"
+  final override val styleName: String = "org.scalatest.FunSpec"
     
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/funspec/AsyncFunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/funspec/AsyncFunSpecLike.scala
@@ -508,7 +508,7 @@ trait AsyncFunSpecLike extends AsyncTestSuite with AsyncTestRegistration with In
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.funspec.AsyncFunSpec"
+  final override val styleName: String = "org.scalatest.FunSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/funspec/FixtureAnyFunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/funspec/FixtureAnyFunSpecLike.scala
@@ -636,7 +636,7 @@ trait FixtureAnyFunSpecLike extends org.scalatest.FixtureTestSuite with org.scal
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.funspec.FixtureAnyFunSpec"
+  final override val styleName: String = "org.scalatest.fixture.FunSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/funspec/FixtureAsyncFunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/funspec/FixtureAsyncFunSpecLike.scala
@@ -593,7 +593,7 @@ trait FixtureAsyncFunSpecLike extends org.scalatest.FixtureAsyncTestSuite with o
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.funspec.FixtureAsyncFunSpec"
+  final override val styleName: String = "org.scalatest.fixture.FunSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/funspec/PathAnyFunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/funspec/PathAnyFunSpecLike.scala
@@ -660,7 +660,7 @@ trait PathAnyFunSpecLike extends org.scalatest.Suite with OneInstancePerTest wit
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.funspec.PathAnyFunSpec"
+  final override val styleName: String = "org.scalatest.path.FunSpec"
     
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = {
     ensureTestResultsRegistered(thisSuite)
diff --git a/scalatest/src/main/scala/org/scalatest/funsuite/AnyFunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/funsuite/AnyFunSuiteLike.scala
@@ -264,7 +264,7 @@ trait AnyFunSuiteLike extends TestSuite with TestRegistration with Informing wit
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.funsuite.AnyFunSuite"
+  final override val styleName: String = "org.scalatest.FunSuite"
 
   // Inherits scaladoc
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
diff --git a/scalatest/src/main/scala/org/scalatest/funsuite/AsyncFunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/funsuite/AsyncFunSuiteLike.scala
@@ -247,7 +247,7 @@ trait AsyncFunSuiteLike extends AsyncTestSuite with AsyncTestRegistration with I
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.funsuite.AsyncFunSuite"
+  final override val styleName: String = "org.scalatest.FunSuite"
 
   // Inherits scaladoc
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
diff --git a/scalatest/src/main/scala/org/scalatest/funsuite/FixtureAnyFunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/funsuite/FixtureAnyFunSuiteLike.scala
@@ -377,7 +377,7 @@ trait FixtureAnyFunSuiteLike extends org.scalatest.FixtureTestSuite with org.sca
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.funsuite.FixtureAnyFunSuite"
+  final override val styleName: String = "org.scalatest.fixture.FunSuite"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/funsuite/FixtureAsyncFunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/funsuite/FixtureAsyncFunSuiteLike.scala
@@ -349,7 +349,7 @@ trait FixtureAsyncFunSuiteLike extends org.scalatest.FixtureAsyncTestSuite with
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.funsuite.FixtureAsyncFunSuite"
+  final override val styleName: String = "org.scalatest.fixture.FunSuite"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/propspec/AnyPropSpecLike.scala b/scalatest/src/main/scala/org/scalatest/propspec/AnyPropSpecLike.scala
@@ -262,7 +262,7 @@ trait AnyPropSpecLike extends TestSuite with TestRegistration with Informing wit
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.propspec.AnyPropSpec"
+  final override val styleName: String = "org.scalatest.PropSpec"
   
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/propspec/AsyncPropSpecLike.scala b/scalatest/src/main/scala/org/scalatest/propspec/AsyncPropSpecLike.scala
@@ -224,7 +224,7 @@ trait AsyncPropSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.propspec.AsyncPropSpec"
+  final override val styleName: String = "org.scalatest.PropSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }*/
diff --git a/scalatest/src/main/scala/org/scalatest/propspec/FixtureAnyPropSpecLike.scala b/scalatest/src/main/scala/org/scalatest/propspec/FixtureAnyPropSpecLike.scala
@@ -357,7 +357,7 @@ trait FixtureAnyPropSpecLike extends org.scalatest.FixtureTestSuite with org.sca
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.propspec.FixtureAnyPropSpec"
+  final override val styleName: String = "org.scalatest.fixture.PropSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/propspec/FixtureAsyncPropSpecLike.scala b/scalatest/src/main/scala/org/scalatest/propspec/FixtureAsyncPropSpecLike.scala
@@ -321,7 +321,7 @@ trait FixtureAsyncPropSpecLike extends AsyncTestSuite with AsyncTestRegistration
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.propspec.FixtureAsyncPropSpec"
+  final override val styleName: String = "org.scalatest.fixture.PropSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }*/
diff --git a/scalatest/src/main/scala/org/scalatest/wordspec/AnyWordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/wordspec/AnyWordSpecLike.scala
@@ -1216,7 +1216,7 @@ one error found
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.wordspec.AnyWordSpec"
+  final override val styleName: String = "org.scalatest.WordSpec"
     
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/wordspec/AsyncWordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/wordspec/AsyncWordSpecLike.scala
@@ -1203,7 +1203,7 @@ one error found
    * will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>
    */
   @deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")
-  final override val styleName: String = "org.scalatest.wordspec.AsyncWordSpec"
+  final override val styleName: String = "org.scalatest.WordSpec"
 
   override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)
 }
diff --git a/scalatest/src/main/scala/org/scalatest/wordspec/FixtureAnyWordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/wordspec/FixtureAnyWordSpecLike.scala
diff --git a/scalatest/src/main/scala/org/scalatest/wordspec/FixtureAsyncWordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/wordspec/FixtureAsyncWordSpecLike.scala

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ trait FixtureSuite extends org.scalatest.Suite { thisSuite =>`
`342`	`342`	`* will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>`
`343`	`343`	`*/`
`344`	`344`	`@deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")`
`345`		`- override val styleName: String = "org.scalatest.FixtureSuite"`
	`345`	`+ override val styleName: String = "org.scalatest.fixture.Suite"`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ trait AnyFeatureSpecLike extends TestSuite with TestRegistration with Informing`
`400`	`400`	`* will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>`
`401`	`401`	`*/`
`402`	`402`	`@deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")`
`403`		`- final override val styleName: String = "org.scalatest.featurespec.AnyFeatureSpec"`
	`403`	`+ final override val styleName: String = "org.scalatest.FeatureSpec"`
`404`	`404`
`405`	`405`	`override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)`
`406`	`406`	`}`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ trait AsyncFeatureSpecLike extends AsyncTestSuite with AsyncTestRegistration wit`
`382`	`382`	`* will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>`
`383`	`383`	`*/`
`384`	`384`	`@deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")`
`385`		`- final override val styleName: String = "org.scalatest.featurespec.AsyncFeatureSpec"`
	`385`	`+ final override val styleName: String = "org.scalatest.FeatureSpec"`
`386`	`386`
`387`	`387`	`override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)`
`388`	`388`	`}`
Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ trait FixtureAnyFeatureSpecLike extends org.scalatest.FixtureTestSuite with org.`
`433`	`433`	`* will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>`
`434`	`434`	`*/`
`435`	`435`	`@deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")`
`436`		`- final override val styleName: String = "org.scalatest.featurespec.FixtureAnyFeatureSpec"`
	`436`	`+ final override val styleName: String = "org.scalatest.fixture.FeatureSpec"`
`437`	`437`
`438`	`438`	`override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)`
`439`	`439`	`}`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ trait FixtureAsyncFeatureSpecLike extends org.scalatest.FixtureAsyncTestSuite wi`
`399`	`399`	`* will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>`
`400`	`400`	`*/`
`401`	`401`	`@deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")`
`402`		`- final override val styleName: String = "org.scalatest.featurespec.FixtureAsyncFeatureSpec"`
	`402`	`+ final override val styleName: String = "org.scalatest.fixture.FeatureSpec"`
`403`	`403`
`404`	`404`	`override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)`
`405`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1822,7 +1822,7 @@ import resultOfStringPassedToVerb.verb`
`1822`	`1822`	`* will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>`
`1823`	`1823`	`*/`
`1824`	`1824`	`@deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")`
`1825`		`- final override val styleName: String = "org.scalatest.flatspec.AnyFlatSpec"`
	`1825`	`+ final override val styleName: String = "org.scalatest.FlatSpec"`
`1826`	`1826`
`1827`	`1827`	`override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)`
`1828`	`1828`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1838,7 +1838,7 @@ import resultOfStringPassedToVerb.verb`
`1838`	`1838`	`* will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>`
`1839`	`1839`	`*/`
`1840`	`1840`	`@deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")`
`1841`		`- final override val styleName: String = "org.scalatest.flatspec.AsyncFlatSpec"`
	`1841`	`+ final override val styleName: String = "org.scalatest.FlatSpec"`
`1842`	`1842`
`1843`	`1843`	`override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)`
`1844`	`1844`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2229,7 +2229,7 @@ import resultOfStringPassedToVerb.verb`
`2229`	`2229`	`* will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>`
`2230`	`2230`	`*/`
`2231`	`2231`	`@deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")`
`2232`		`- final override val styleName: String = "org.scalatest.flatspec.FixtureAnyFlatSpec"`
	`2232`	`+ final override val styleName: String = "org.scalatest.fixture.FlatSpec"`
`2233`	`2233`
`2234`	`2234`	`override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)`
`2235`	`2235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2204,7 +2204,7 @@ import resultOfStringPassedToVerb.verb`
`2204`	`2204`	`* will replace chosen styles as the tool to encourage consistency across a project. We do not plan a replacement for <code>styleName</code>.</p>`
`2205`	`2205`	`*/`
`2206`	`2206`	`@deprecated("The styleName lifecycle method has been deprecated and will be removed in a future version of ScalaTest with no replacement.", "3.1.0")`
`2207`		`- final override val styleName: String = "org.scalatest.flatspec.FixtureAsyncFlatSpec"`
	`2207`	`+ final override val styleName: String = "org.scalatest.fixture.FlatSpec"`
`2208`	`2208`
`2209`	`2209`	`override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = createTestDataFor(testName, theConfigMap, this)`
`2210`	`2210`	`}`