Implement review comments

spockframework · Dec 16, 2023 · 3437800 · 3437800
1 parent f55e309
commit 3437800
Show file tree

Hide file tree

Showing 3 changed files with 163 additions and 164 deletions.
diff --git a/spock-specs/src/test/groovy/org/spockframework/smoke/Interceptors.groovy b/spock-specs/src/test/groovy/org/spockframework/smoke/Interceptors.groovy
@@ -1,17 +1,16 @@
 /*
  * Copyright 2023 the original author or authors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
 package org.spockframework.smoke
@@ -176,14 +175,14 @@ class SubSpec extends SuperSpec {
       }
       specInfo.specsBottomToTop.each { spec ->
         spec.addInitializerInterceptor {
-          proceed(it, 'initializer', "$it.spec.name.$it.feature.name / $spec.name")
+          proceed(it, 'initializer', "$it.spec.name.$it.feature.name[#$it.iteration.iterationIndex] / $spec.name")
         }
       }
       specInfo.allInitializerMethods*.addInterceptor {
         proceed(it, 'initializer method', "$it.feature.parent.name.$it.feature.name[#$it.iteration.iterationIndex] / $it.spec.name.$it.method.name()")
       }
       allFeatures*.addInitializerInterceptor {
-        proceed(it, 'feature scoped initializer', "$it.spec.name.$it.feature.name")
+        proceed(it, 'feature scoped initializer', "$it.spec.name.$it.feature.name[#$it.iteration.iterationIndex]")
       }
       allFeatures*.addIterationInterceptor {
         proceed(it, 'iteration', "$it.spec.name.$it.feature.name[#$it.iteration.iterationIndex]")
@@ -194,7 +193,7 @@ class SubSpec extends SuperSpec {
         }
       }
       allFeatures*.addSetupInterceptor {
-        proceed(it, 'feature scoped setup', "$it.spec.name.$it.feature.name")
+        proceed(it, 'feature scoped setup', "$it.spec.name.$it.feature.name[#$it.iteration.iterationIndex]")
       }
       specInfo.allSetupMethods*.addInterceptor {
         proceed(it, 'setup method', "$it.feature.parent.name.$it.feature.name[#$it.iteration.iterationIndex] / $it.spec.name.$it.method.name()")
@@ -208,7 +207,7 @@ class SubSpec extends SuperSpec {
         }
       }
       allFeatures*.addCleanupInterceptor {
-        proceed(it, 'feature scoped cleanup', "$it.spec.name.$it.feature.name")
+        proceed(it, 'feature scoped cleanup', "$it.spec.name.$it.feature.name[#$it.iteration.iterationIndex]")
       }
       specInfo.allCleanupMethods*.addInterceptor {
         proceed(it, 'cleanup method', "$it.feature.parent.name.$it.feature.name[#$it.iteration.iterationIndex] / $it.spec.name.$it.method.name()")