#233 - Added WallPostsRandomQuote tests.

Author: Mikhail Yakushin

pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.github.driver733</groupId>
             <artifactId>vk-java-sdk</artifactId>
-            <version>8f0787b2ea</version>
+            <version>1741c9e583</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -163,7 +163,6 @@
                     <excludes>
                         <exclude>checkstyle:/src/test/resources/.*</exclude>
                         <exclude>xml:/src/main/resources/.*</exclude>
-                        <exclude>duplicatefinder:.*</exclude>
                         <exclude>cobertura:.*</exclude>
                         <exclude>dependencies:.*</exclude>
 

src/main/java/com/driver733/vkmusicuploader/media/MediaRandom.java

@@ -80,7 +80,7 @@ public Path file() throws IOException {
             ThreadLocalRandom.current()
                 .nextInt(
                     0,
-                    files.size() + 1
+                    files.size()
                 )
         );
     }

src/main/java/com/driver733/vkmusicuploader/wallpost/attachment/upload/TransportClientFake.java

@@ -94,4 +94,9 @@ public ClientResponse post(
     public boolean isCached() {
         return true;
     }
+
+    @Override
+    public boolean isTest() {
+        return true;
+    }
 }

src/main/java/com/driver733/vkmusicuploader/wallpost/wallpost/wallposts/WallPostsRandomQuote.java

@@ -29,6 +29,7 @@
 import com.driver733.vkmusicuploader.media.audio.MediaEmpty;
 import com.driver733.vkmusicuploader.media.photo.MediaPhotosBasic;
 import com.driver733.vkmusicuploader.post.UploadServers;
+import com.driver733.vkmusicuploader.wallpost.attachment.upload.TransportClientFake;
 import com.driver733.vkmusicuploader.wallpost.wallpost.WallPostWithRandomQuote;
 import com.jcabi.aspects.Immutable;
 import com.vk.api.sdk.client.VkApiClient;
@@ -38,6 +39,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Creates {@link com.driver733.vkmusicuploader.wallpost.wallpost.WallPost}s
@@ -116,24 +118,30 @@ public final class WallPostsRandomQuote implements WallPosts {
      * Ctor.
      * @param client The {@link VkApiClient} for all requests.
      * @param actor UserActor on behalf of which all requests will be sent.
-     * @param servers Upload servers that provide upload URLs
-     *  for attachmentsFields.
      * @param group Group ID.
      * @param count Number of posts to create.
      * @checkstyle ParameterNumberCheck (200 lines)
      */
     public WallPostsRandomQuote(
         final VkApiClient client,
         final UserActor actor,
-        final UploadServers servers,
         final int group,
         final int count
     ) {
         this.client = client;
         this.actor = actor;
+        this.servers = new UploadServers(
+            new VkApiClient(
+                new TransportClientFake()
+            ),
+            new UserActor(
+                0,
+                ""
+            ),
+            0
+        );
         this.photos = new MediaEmpty();
         this.audios = new MediaEmpty();
-        this.servers = servers;
         this.group = group;
         this.count = count;
     }
@@ -167,6 +175,35 @@ public WallPostsRandomQuote(
         this.audios = new MediaEmpty();
     }
 
+    /**
+     * Ctor.
+     * @param client The {@link VkApiClient} for all requests.
+     * @param actor UserActor on behalf of which all requests will be sent.
+     * @param servers Upload servers that provide upload URLs
+     *  for attachmentsFields.
+     * @param group Group ID.
+     * @param count Number of posts to create.
+     * @param audios Directory with audios.
+     */
+    public WallPostsRandomQuote(
+        final VkApiClient client,
+        final UserActor actor,
+        final UploadServers servers,
+        final int group,
+        final Path audios,
+        final int count
+    ) {
+        this.client = client;
+        this.actor = actor;
+        this.servers = servers;
+        this.group = group;
+        this.count = count;
+        this.photos = new MediaEmpty();
+        this.audios = new MediaAudiosBasic(
+            audios
+        );
+    }
+
     /**
      * Ctor.
      * @param client The {@link VkApiClient} for all requests.
@@ -297,7 +334,7 @@ private List<ExecuteBatchQuery> posts(
         final int cost,
         final WallPostWithRandomQuote wallpost
     ) throws Exception {
-        int left = this.count * cost;
+        int left = this.count;
         final List<ExecuteBatchQuery> result = new ArrayList<>(
             (int) Math.ceil(
                 (double) this.count / WallPostsRandomQuote.BATCH_MAX_REQ * cost
@@ -309,15 +346,17 @@ private List<ExecuteBatchQuery> posts(
             );
             for (
                 int iter = 0;
-                iter < WallPostsRandomQuote.BATCH_MAX_REQ;
+                iter < this.count;
                 iter += 1
             ) {
                 queries.add(
                     wallpost.construct()
                 );
+                TimeUnit.SECONDS.sleep(2);
             }
             result.add(
-                this.client.execute().batch(
+                new ExecuteBatchQuery(
+                    this.client,
                     this.actor,
                     queries.toArray(
                         new WallPostQuery[0]

src/test/java/com/driver733/vkmusicuploader/wallpost/wallpost/JsonPattern.java

@@ -0,0 +1,97 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Mikhail Yakushin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.driver733.vkmusicuploader.wallpost.wallpost;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.jcabi.aspects.Immutable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Retrieves JSON from VK Execute API call.
+ *
+ * @since 0.1
+ */
+@Immutable
+@SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes")
+public final class JsonPattern {
+
+    /**
+     * Exec String for VK Execute API call.
+     */
+    private final String exec;
+
+    /**
+     * Regex pattern.
+     */
+    private final Pattern pattern;
+
+    /**
+     * Ctor.
+     * @param exec Exec String for VK Execute API call.
+     * @param pattern Regex pattern.
+     */
+    public JsonPattern(
+        final String exec,
+        final Pattern pattern
+    ) {
+        this.exec = exec;
+        this.pattern = pattern;
+    }
+
+    /**
+     * Creates a JSON object from the provided string.
+     * @return Created {@link JsonObject}.
+     * @throws Exception If the provided patter was not found.
+     */
+    public JsonObject json() throws Exception {
+        final Matcher matcher = this.pattern.matcher(
+            this.exec
+        );
+        if (matcher.find()) {
+            String match = matcher.group();
+            match = match.substring(
+                0,
+                match.length() - 2
+            );
+            return new Gson()
+                .fromJson(
+                    match,
+                    JsonObject.class
+                );
+        }
+        throw new Exception(
+            String.format(
+                String.join(
+                    "No occurrence of the provided pattern \"%s\"",
+                        " found in the Json String \"%s\""
+                ),
+                this.pattern.toString(),
+                this.exec
+            )
+        );
+    }
+
+}

src/test/java/com/driver733/vkmusicuploader/wallpost/wallpost/WallPostPhotoAlbumTest.java

@@ -44,8 +44,6 @@
 /**
  * Test for {@link WallPostPhotoAlbum}.
  *
- *
- *
  * @since 0.2
  * @checkstyle AnonInnerLengthCheck (500 lines)
  * @checkstyle JavadocMethodCheck (500 lines)