Added spock test framework and tests for queue service (Azure#4940)

* Migrate queue to spock test framework * Remove all Junit tests and dependencies
test-repo-billy · Aug 15, 2019 · 98341e7 · 98341e7
1 parent 2f1b778
commit 98341e7
Show file tree

Hide file tree

Showing 174 changed files with 6,826 additions and 5,809 deletions.
diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml
@@ -54,31 +54,17 @@
       <version>1.0.0-preview.4</version>
       <scope>test</scope>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.spockframework/spock-core -->
     <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-identity</artifactId>
-      <version>1.0.0-preview.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>1.3-groovy-2.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>adal4j</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueAsyncClient.java
@@ -24,6 +24,7 @@
 import com.azure.storage.queue.models.SignedIdentifier;
 import com.azure.storage.queue.models.StorageErrorException;
 import com.azure.storage.queue.models.UpdatedMessage;
+import java.util.Objects;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -62,6 +63,7 @@ public final class QueueAsyncClient {
      * @param queueName Name of the queue
      */
     QueueAsyncClient(AzureQueueStorageImpl client, String queueName) {
+        Objects.requireNonNull(queueName);
         this.queueName = queueName;
 
         this.client = new AzureQueueStorageBuilder().pipeline(client.getHttpPipeline())
@@ -79,6 +81,7 @@ public final class QueueAsyncClient {
      * @param queueName Name of the queue
      */
     QueueAsyncClient(URL endpoint, HttpPipeline httpPipeline, String queueName) {
+        Objects.requireNonNull(queueName);
         this.queueName = queueName;
 
         this.client = new AzureQueueStorageBuilder().pipeline(httpPipeline)

diff --git a/...storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java b/...storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueClientBuilder.java
@@ -140,7 +140,6 @@ public QueueClient buildClient() {
      */
     public QueueAsyncClient buildAsyncClient() {
         Objects.requireNonNull(endpoint);
-        Objects.requireNonNull(queueName);
 
         if (sasTokenCredential == null && sharedKeyCredential == null && bearerTokenCredential == null) {
             LOGGER.logExceptionAsError(new IllegalArgumentException("Credentials are required for authorization"));

diff --git a/...ge/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java b/...ge/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java
@@ -27,6 +27,11 @@ public final class StorageErrorCode extends ExpandableStringEnum<StorageErrorCod
      */
     public static final StorageErrorCode ACCOUNT_IS_DISABLED = fromString("AccountIsDisabled");
 
+    /**
+     * Static value AuthenticationError for StorageErrorCode.
+     */
+    public static final StorageErrorCode AUTHENTICATION_ERROR = fromString("AuthenticationError");
+
     /**
      * Static value AuthenticationFailed for StorageErrorCode.
      */