Tests - Fix possible NPE

Author: RobiNino

Diff for: build-info-extractor/src/test/java/org/jfrog/build/extractor/clientConfiguration/util/DownloadTest.java

@@ -32,15 +32,16 @@ public class DownloadTest extends IntegrationTestsBase {
 
     /**
      * Tests download of files - both bulk and concurrently.
-     * @param uploadedChecksum checksums of the artifact uploaded to Artifactory, used to compare with the downloaded artifact.
-     * @param fileName
-     * @param fileSize
+     *
+     * @param uploadedChecksum - checksums of the artifact uploaded to Artifactory, used to compare with the downloaded artifact.
+     * @param fileName         - artifact name to download.
+     * @param fileSize         - artifact size to download.
      */
     @Test(dataProvider = "testDownloadFilesProvider")
     public void testBulkAndConcurrentDownload(Map<String, String> uploadedChecksum, String fileName, long fileSize)
             throws Exception {
         String uriWithParams = dependenciesClient.getArtifactoryUrl() + "/" + localRepo1 + "/" + TEST_REPO_PATH + "/" + fileName;
-        String fileDestination =  tempWorkspace.getPath() + File.separatorChar + "download" + File.separatorChar + fileName;
+        String fileDestination = tempWorkspace.getPath() + File.separatorChar + "download" + File.separatorChar + fileName;
 
         DependenciesDownloaderHelper helper = new DependenciesDownloaderHelper(dependenciesClient, tempWorkspace.getPath(), log);
         DependenciesDownloaderHelper.ArtifactMetaData artifactMetaData = helper.downloadArtifactMetaData(uriWithParams);
@@ -72,7 +73,7 @@ public void testDownloadArtifact(Map<String, String> uploadedChecksum, String fi
         DependenciesDownloaderHelper dependenciesDownloaderHelper = new DependenciesDownloaderHelper(dependenciesClient, ".", log);
 
         String repoUrl = dependenciesClient.getArtifactoryUrl() + "/" + localRepo1 + "/" + TEST_REPO_PATH;
-        String targetDirPath =  tempWorkspace.getPath() + File.separatorChar + "download" + File.separatorChar;
+        String targetDirPath = tempWorkspace.getPath() + File.separatorChar + "download" + File.separatorChar;
         String url = repoUrl + "/" + fileName;
 
         ArtifactMetaData artifactMetaData = dependenciesDownloaderHelper.downloadArtifactMetaData(url);
@@ -94,7 +95,7 @@ public void testDownloadArtifactWithoutContentLength(Map<String, String> uploade
         DependenciesDownloaderHelper dependenciesDownloaderHelper = new DependenciesDownloaderHelper(dependenciesClient, ".", log);
 
         String repoUrl = dependenciesClient.getArtifactoryUrl() + "/" + localRepo1 + "/" + TEST_REPO_PATH;
-        String targetDirPath =  tempWorkspace.getPath() + File.separatorChar + "download" + File.separatorChar;
+        String targetDirPath = tempWorkspace.getPath() + File.separatorChar + "download" + File.separatorChar;
         String url = repoUrl + "/" + fileName;
 
         ArtifactMetaData artifactMetaData = dependenciesDownloaderHelper.downloadArtifactMetaData(url);
@@ -117,6 +118,9 @@ public void testDownloadArtifactWithoutContentLength(Map<String, String> uploade
      */
     @DataProvider
     private Object[][] testDownloadFilesProvider() throws IOException, NoSuchAlgorithmException {
+        if (buildInfoClient == null) {
+            throw new IOException("tests were not initialized successfully. aborting");
+        }
         Map<String, Integer> testFilesMap = new HashMap<String, Integer>() {{
             put("file1", MIN_SIZE_FOR_CONCURRENT_DOWNLOAD);
             put("file2", MIN_SIZE_FOR_CONCURRENT_DOWNLOAD - 1);

Diff for: build-info-extractor/src/testFixtures/java/org/jfrog/build/IntegrationTestsBase.java

@@ -23,6 +23,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
@@ -143,6 +144,9 @@ private void failInit() {
      * @throws IOException
      */
     protected void deleteContentFromRepo(String repo) throws IOException {
+        if (!isRepoExists(repo)) {
+            return;
+        }
         String fullItemUrl = url + repo + "/";
         String itemUrl = ArtifactoryHttpClient.encodeUrl(fullItemUrl);
         HttpRequestBase httpRequest = new HttpDelete(itemUrl);
@@ -155,7 +159,7 @@ protected void deleteContentFromRepo(String repo) throws IOException {
                 throw new FileNotFoundException("Bad credentials for username: " + username);
             }
             if (statusCode < 200 || statusCode >= 300) {
-                throw new IOException("Error deleting " + localRepo1 + ". Code: " + statusCode + " Message: " + statusLine.getReasonPhrase());
+                throw new IOException(getRepositoryCustomErrorMessage(repo, false, statusLine));
             }
         }
     }
@@ -193,7 +197,7 @@ protected void createTestRepo(String repo) throws IOException {
                 EntityUtils.consumeQuietly(response.getEntity());
                 int statusCode = response.getStatusLine().getStatusCode();
                 if (statusCode != HttpStatus.SC_OK && statusCode != HttpStatus.SC_CREATED) {
-                    throw new IOException("Error creating repository: " + repo + ". Code: " + statusCode + " Message: " + response.getStatusLine().getReasonPhrase());
+                    throw new IOException(getRepositoryCustomErrorMessage(repo, true, response.getStatusLine()));
                 }
             }
         }
@@ -214,7 +218,7 @@ protected void deleteTestRepo(String repo) throws IOException {
             EntityUtils.consumeQuietly(response.getEntity());
             int statusCode = response.getStatusLine().getStatusCode();
             if (statusCode != HttpStatus.SC_OK) {
-                throw new IOException("Error deleting repository" + repo + ". Code: " + statusCode + " Message: " + response.getStatusLine().getReasonPhrase());
+                throw new IOException(getRepositoryCustomErrorMessage(repo, false, response.getStatusLine()));
             }
         }
     }
@@ -232,7 +236,7 @@ private String getRepoApiUrl(String repo) {
      * @throws IOException
      */
     protected String readSpec(File specFile, String workSpacePath) throws IOException {
-        String spec = FileUtils.readFileToString(specFile, "UTF-8");
+        String spec = FileUtils.readFileToString(specFile, StandardCharsets.UTF_8);
         spec = StringUtils.replace(spec, LOCAL_REPO_PLACEHOLDER, localRepo1);
         spec = StringUtils.replace(spec, LOCAL_REPO2_PLACEHOLDER, localRepo2);
         spec = StringUtils.replace(spec, VIRTUAL_REPO_PLACEHOLDER, virtualRepo);
@@ -306,4 +310,23 @@ public void setFiles(List<String> files) {
         }
     }
 
+    /***
+     * Returns a custom exception error to be thrown when repository creation/deletion fails.
+     * @param repo - repo name.
+     * @param creating - creation or deletion failed.
+     * @param statusLine - status returned.
+     * @return - custom error message.
+     */
+    private String getRepositoryCustomErrorMessage(String repo, boolean creating, StatusLine statusLine) {
+        StringBuilder builder = new StringBuilder()
+                .append("Error ")
+                .append(creating ? "creating" : "deleting")
+                .append(" '").append(repo).append("'. ")
+                .append("Code: ").append(statusLine.getStatusCode());
+        if (statusLine.getReasonPhrase() != null) {
+            builder.append(" Message: ")
+                    .append(statusLine.getReasonPhrase());
+        }
+        return builder.toString();
+    }
 }