From 19240a9cafdbccb2bf1a3ec4682a6ca61e2798b0 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 5 Dec 2021 18:13:02 +0000
Subject: [PATCH] Removed duplicated strings in zip tests

---
 .../test/arbitrary/ArbitraryCompressionTests.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/qortal/test/arbitrary/ArbitraryCompressionTests.java b/src/test/java/org/qortal/test/arbitrary/ArbitraryCompressionTests.java
index ff185057..9fa580f6 100644
--- a/src/test/java/org/qortal/test/arbitrary/ArbitraryCompressionTests.java
+++ b/src/test/java/org/qortal/test/arbitrary/ArbitraryCompressionTests.java
@@ -27,9 +27,10 @@ public class ArbitraryCompressionTests extends Common {
 
     @Test
     public void testZipSingleFile() throws IOException, InterruptedException {
+        String fileName = "data";
         Path inputFile = Files.createTempFile("inputFile", null);
         Path outputDirectory = Files.createTempDirectory("outputDirectory");
-        Path outputFile = Paths.get(outputDirectory.toString(), "data");
+        Path outputFile = Paths.get(outputDirectory.toString(), fileName);
         inputFile.toFile().deleteOnExit();
         outputDirectory.toFile().deleteOnExit();
 
@@ -41,7 +42,6 @@ public class ArbitraryCompressionTests extends Common {
         assertTrue(Files.exists(inputFile));
         assertFalse(Files.exists(outputFile));
 
-        String fileName = "data"; //isSingleFile ? singleFileName : null;
         ZipUtils.zip(inputFile.toString(), outputFile.toString(), fileName);
 
         assertTrue(Files.exists(inputFile));
@@ -53,7 +53,7 @@ public class ArbitraryCompressionTests extends Common {
         // Create paths for unzipping
         Path unzippedDirectory = Files.createTempDirectory("unzippedDirectory");
         // Single file data is unzipped directly, without an enclosing folder
-        Path unzippedFile = Paths.get(unzippedDirectory.toString(), "data");
+        Path unzippedFile = Paths.get(unzippedDirectory.toString(), fileName);
         unzippedDirectory.toFile().deleteOnExit();
         assertFalse(Files.exists(unzippedFile));
 
@@ -69,9 +69,10 @@ public class ArbitraryCompressionTests extends Common {
 
     @Test
     public void testZipMultipleFiles() throws IOException, InterruptedException, DataException {
+        String fileName = "data";
         Path inputDirectory = Files.createTempDirectory("inputDirectory");
         Path outputDirectory = Files.createTempDirectory("outputDirectory");
-        Path outputFile = Paths.get(outputDirectory.toString(), "data");
+        Path outputFile = Paths.get(outputDirectory.toString(), fileName);
         inputDirectory.toFile().deleteOnExit();
         outputDirectory.toFile().deleteOnExit();
 
@@ -89,7 +90,7 @@ public class ArbitraryCompressionTests extends Common {
         assertTrue(Files.exists(inputFile2));
         assertFalse(Files.exists(outputFile));
 
-        String fileName = "data"; //isSingleFile ? singleFileName : null;
+        // Zip...
         ZipUtils.zip(inputDirectory.toString(), outputFile.toString(), fileName);
 
         assertTrue(Files.exists(inputDirectory));