Refactored test header logic into a global spock extension

eng/.docsettings.yml

@@ -168,6 +168,7 @@ known_content_issues:
   - ['sdk/storage/azure-storage-blob/swagger/README.md', '#3113']
   - ['sdk/storage/azure-storage-blob-nio/README.md', '#3113']
   - ['sdk/storage/azure-storage-common/README.md', '#3113']
+  - ['sdk/storage/azure-storage-data-movement/README.md', '#3113']
   - ['sdk/storage/azure-storage-file/swagger/README.md', '#3113']
   - ['sdk/storage/azure-storage-file-datalake/swagger/README.md', '#3113']
   - ['sdk/storage/azure-storage-file-share/swagger/README.md','has other required sections']

eng/jacoco-test-coverage/pom.xml

@@ -271,6 +271,11 @@
       <artifactId>azure-storage-common</artifactId>
       <version>12.13.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-storage-data-movement</artifactId>
+      <version>12.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-data-movement;current} -->
+    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>

eng/versioning/version_client.txt

@@ -122,6 +122,7 @@ com.azure:azure-storage-blob-changefeed;12.0.0-beta.7;12.0.0-beta.8
 com.azure:azure-storage-blob-cryptography;12.12.0;12.13.0-beta.1
 com.azure:azure-storage-blob-nio;12.0.0-beta.7;12.0.0-beta.8
 com.azure:azure-storage-common;12.12.0;12.13.0-beta.1
+com.azure:azure-storage-data-movement;12.0.0-beta.1;12.0.0-beta.1
 com.azure:azure-storage-file-share;12.10.0;12.11.0-beta.1
 com.azure:azure-storage-file-datalake;12.6.0;12.7.0-beta.1
 com.azure:azure-storage-internal-avro;12.0.5;12.1.0-beta.1

pom.xml

@@ -115,6 +115,7 @@
         <module>sdk/storage/azure-storage-blob-cryptography</module>
         <module>sdk/storage/azure-storage-blob-nio</module>
         <module>sdk/storage/azure-storage-common</module>
+        <module>sdk/storage/azure-storage-data-movement</module>
         <module>sdk/storage/azure-storage-file-datalake</module>
         <module>sdk/storage/azure-storage-file-share</module>
         <module>sdk/storage/azure-storage-internal-avro</module>
@@ -317,6 +318,10 @@
                     <title>Azure Storage - Common</title>
                     <packages>com.azure.storage.common*</packages>
                   </group>
+                  <group>
+                    <title>Azure Storage - Data Movement</title>
+                    <packages>com.azure.storage.data.movement*</packages>
+                  </group>
                   <group>
                     <title>Azure Storage - Blobs</title>
                     <packages>com.azure.storage.blob*</packages>

sdk/storage/azure-storage-blob-batch/src/test/java/com/azure/storage/blob/batch/OptionsBagTest.groovy

@@ -9,13 +9,6 @@ import spock.lang.Specification
 
 class OptionsBagTest extends Specification {
 
-    def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
-    }
-
     def "SetAccessTier constructor"() {
         setup:
         def url = "https://account.blob.core.windows.net/container/blob"

sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/BlobChangefeedPagedFluxTest.groovy

@@ -27,10 +27,6 @@ class BlobChangefeedPagedFluxTest extends Specification {
     List<BlobChangefeedEventWrapper> mockEventWrappers
 
     def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
         setupEvents()
         mockContainer = mock(BlobContainerAsyncClient.class)
         mockChangefeedFactory = mock(ChangefeedFactory.class)

sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/BlobChunkedDownloaderTest.groovy

@@ -15,10 +15,6 @@ class BlobChunkedDownloaderTest extends APISpec {
     BlobChunkedDownloaderFactory factory
 
     def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
         def cc = primaryBlobServiceAsyncClient.getBlobContainerAsyncClient(generateContainerName())
         cc.create().block()
         bc = Spy(cc.getBlobAsyncClient(generateBlobName()))

sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/ChangefeedCursorTest.groovy

@@ -12,13 +12,6 @@ import java.time.OffsetDateTime
 
 class ChangefeedCursorTest extends Specification {
 
-    def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
-    }
-
     String urlHost = 'testaccount.blob.core.windows.net'
     OffsetDateTime endTime = OffsetDateTime.MAX
 

sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/ChangefeedTest.groovy

@@ -37,10 +37,6 @@ class ChangefeedTest extends Specification {
     String urlHost = 'testaccount.blob.core.windows.net'
 
     def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
         mockContainer = mock(BlobContainerAsyncClient.class)
         mockSegmentFactory = mock(SegmentFactory.class)
 

sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/ChunkTest.groovy

@@ -44,10 +44,6 @@ class ChunkTest extends Specification {
     List<AvroObject> mockAvroObjects
 
     def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
         setupEvents()
 
         mockContainer = mock(BlobContainerAsyncClient.class)

sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/SegmentTest.groovy

@@ -38,10 +38,6 @@ class SegmentTest extends Specification {
     ChangefeedCursor cfCursor
 
     def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
         mockContainer = mock(BlobContainerAsyncClient.class)
         mockBlob = mock(BlobAsyncClient.class)
         mockShardFactory = mock(ShardFactory.class)

sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/ShardTest.groovy

@@ -44,10 +44,6 @@ class ShardTest extends Specification {
     ChangefeedCursor segmentCursor
 
     def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
         mockContainer = mock(BlobContainerAsyncClient.class)
         mockChunkFactory = mock(ChunkFactory.class)
         mockChunk0 = mock(Chunk.class)

sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/TimeUtilsTest.groovy

@@ -9,13 +9,6 @@ import java.time.ZoneOffset
 
 class TimeUtilsTest extends Specification {
 
-    def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
-    }
-
     @Unroll
     def "convertPathToTime"() {
         expect:

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobServiceSasModelsTest.groovy

@@ -17,13 +17,6 @@ import java.time.ZoneOffset
 
 class BlobServiceSasModelsTest extends Specification {
 
-    def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
-    }
-
     @Unroll
     def "BlobSASPermissions toString"() {
         setup:

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/implementation/util/StorageBlockingSinkTest.groovy

@@ -14,13 +14,6 @@ import java.util.concurrent.TimeUnit
 
 class StorageBlockingSinkTest extends Specification {
 
-    def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
-    }
-
     def "min"() {
         setup:
         def blockingSink = new StorageBlockingSink()

sdk/storage/azure-storage-common/pom.xml

@@ -59,6 +59,14 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-storage-common</artifactId>
+      <version>12.13.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <classifier>tests</classifier>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
@@ -121,20 +129,19 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.2.0</version>
         <executions>
           <execution>
-            <id>test-jar</id>
-            <phase>test-compile</phase>
+            <id>test-shared-jar</id>
+            <phase>process-test-classes</phase>
             <goals>
-              <goal>test-jar</goal>
+              <goal>single</goal>
             </goals>
             <configuration>
-              <includes>
-                <include>com/azure/storage/common/test/shared/**/*</include>
-                <include>SpockConfig.groovy</include>
-              </includes>
+              <descriptors>
+                <descriptor>src/test-shared/assembly/assembly.xml</descriptor>
+              </descriptors>
             </configuration>
           </execution>
         </executions>

sdk/storage/azure-storage-common/src/test-shared/assembly/assembly.xml

@@ -0,0 +1,29 @@
+<assembly
+    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+  <id>tests</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}\test-classes</directory>
+      <outputDirectory>\</outputDirectory>
+      <includes>
+        <include>com\azure\storage\common\test\shared\**\*</include>
+        <include>SpockConfig.groovy</include>
+      </includes>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}\test-classes\manifests</directory>
+      <outputDirectory>\</outputDirectory>
+      <includes>
+        <include>**\*</include>
+      </includes>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+  </fileSets>
+</assembly>

sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/StorageSpec.groovy

@@ -9,6 +9,7 @@ import com.azure.core.http.policy.HttpPipelinePolicy
 import com.azure.core.test.InterceptorManager
 import com.azure.core.test.TestMode
 import com.azure.core.util.ServiceVersion
+import com.azure.storage.common.test.shared.extensions.TestHeaderExtension
 import spock.lang.Specification
 
 class StorageSpec extends Specification {
@@ -19,10 +20,9 @@ class StorageSpec extends Specification {
     private StorageResourceNamer namer
 
     def setup() {
-        def testName = getTestName()
+        def testName = TestHeaderExtension.FeatureInterceptor.getTestName(specificationContext.getCurrentIteration())
         interceptorManager = new InterceptorManager(testName, ENVIRONMENT.testMode)
         namer = new StorageResourceNamer(testName, ENVIRONMENT.testMode, interceptorManager.getRecordedData())
-        System.out.printf("========================= %s =========================%n", testName)
     }
 
     def cleanup() {
@@ -75,19 +75,4 @@ class StorageSpec extends Specification {
             return interceptorManager.getPlaybackClient()
         }
     }
-
-    private String getTestName() {
-        def iterationInfo = specificationContext.currentIteration
-        def featureInfo = iterationInfo.getParent()
-        def specInfo = featureInfo.getParent()
-        def fullName = specInfo.getName() + featureInfo.getName().split(" ").collect { it.capitalize() }.join("")
-
-        if (iterationInfo.getDataValues().length == 0) {
-            return fullName
-        }
-        def prefix = fullName
-        def suffix = "[" + iterationInfo.getIterationIndex() + "]"
-
-        return prefix + suffix
-    }
 }

sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/extensions/TestHeaderExtension.groovy

@@ -0,0 +1,42 @@
+package com.azure.storage.common.test.shared.extensions
+
+import org.spockframework.runtime.extension.AbstractGlobalExtension
+import org.spockframework.runtime.extension.IMethodInterceptor
+import org.spockframework.runtime.extension.IMethodInvocation
+import org.spockframework.runtime.extension.MethodInvocation
+import org.spockframework.runtime.model.FieldInfo
+import org.spockframework.runtime.model.IterationInfo
+import org.spockframework.runtime.model.SpecInfo
+
+class TestHeaderExtension extends AbstractGlobalExtension {
+    @Override
+    void visitSpec(SpecInfo spec) {
+        spec.allFeatures*.addIterationInterceptor(new FeatureInterceptor());
+        spec.addInitializerInterceptor(new FeatureInterceptor());
+    }
+
+    static class FeatureInterceptor implements IMethodInterceptor {
+        @Override
+        void intercept(IMethodInvocation inv) {
+            // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
+            System.out.printf("========================= %s =========================%n", getTestName(inv.getIteration()))
+            inv.proceed();
+            FieldInfo field = new FieldInfo();
+            inv
+        }
+
+        static String getTestName(IterationInfo iterationInfo) {
+            def featureInfo = iterationInfo.getParent()
+            def specInfo = featureInfo.getParent()
+            def fullName = specInfo.getName() + featureInfo.getName().split(" ").collect { it.capitalize() }.join("")
+
+            if (iterationInfo.getDataValues().length == 0) {
+                return fullName
+            }
+            def prefix = fullName
+            def suffix = "[" + iterationInfo.getIterationIndex() + "]"
+
+            return prefix + suffix
+        }
+    }
+}

sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/implementation/BufferStagingAreaTest.groovy

@@ -8,13 +8,6 @@ import spock.lang.Unroll
 import java.nio.ByteBuffer
 
 class BufferStagingAreaTest extends Specification {
-    def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
-    }
-
     static def generateData(int numBuffs, int minBuffSize, int maxBuffSize) {
         def random = new Random()
         // Generate random sizes between minBuffSize and maxBuffSize for the buffers

sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/implementation/FluxInputStreamTest.groovy

@@ -13,13 +13,6 @@ import java.nio.ByteBuffer
 
 class FluxInputStreamTest extends Specification {
 
-    def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
-    }
-
     /* Network tests to be performed by implementors of the FluxInputStream. */
     Flux<ByteBuffer> generateData(int num) {
         List<ByteBuffer> buffers = new ArrayList<>()

sdk/storage/azure-storage-common/src/test/java/com/azure/storage/common/implementation/SasModelsTest.groovy

@@ -18,13 +18,6 @@ import java.time.ZoneOffset
 
 class SasModelsTest extends Specification {
 
-    def setup() {
-        String fullTestName = specificationContext.getCurrentIteration().getName().replace(' ', '').toLowerCase()
-        String className = specificationContext.getCurrentSpec().getName()
-        // Print out the test name to create breadcrumbs in our test logging in case anything hangs.
-        System.out.printf("========================= %s.%s =========================%n", className, fullTestName)
-    }
-
     @Unroll
     def "AccountSasSignatureValues min"() {
         setup:

sdk/storage/azure-storage-common/src/test/resources/manifests/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension

@@ -0,0 +1 @@
+com.azure.storage.common.test.shared.extensions.TestHeaderExtension

sdk/storage/azure-storage-data-movement/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Release History
+
+## 12.0.0-beta.1 (Unreleased)
+
+### Features included in `azure-storage-data-movement`
+- This package supports functionality for storage data movement library.
+- Reactive streams support using [Project Reactor](https://projectreactor.io/).