newBlocksize test #2

inwc3 · Jul 15, 2018 · 48ff52e · 48ff52e
1 parent ef1b047
commit 48ff52e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/test/java/systems/crigges/jmpq3test/MpqTests.java b/src/test/java/systems/crigges/jmpq3test/MpqTests.java
@@ -12,7 +12,6 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.file.Files;
-import java.nio.file.OpenOption;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
@@ -343,11 +342,17 @@ private Set<File> getFiles(File dir) {
 
     @Test()
     public void newBlocksizeBufferOverflow() throws IOException {
-        File mpq = new File(MpqTests.class.getClassLoader().getResource("./mpqs/newBlocksizeBufferOverflow.w3x").getFile());
+        File mpq = new File(MpqTests.class.getClassLoader().getResource("newBlocksizeBufferOverflow/mpq/newBlocksizeBufferOverflow.w3x").getFile());
 
-        Files.copy(mpq.toPath(), mpq.toPath().resolveSibling("newBlocksizeBufferOverflow.mpq"), StandardCopyOption.REPLACE_EXISTING).toFile();
+        File targetMpq = mpq.toPath().resolveSibling("file1.mpq").toFile();
 
-        String resourceDir = "newBlocksizeBufferOverflowInsertions";
+        targetMpq.delete();
+
+        Files.copy(mpq.toPath(), targetMpq.toPath(), StandardCopyOption.REPLACE_EXISTING).toFile();
+
+        mpq = targetMpq;
+
+        String resourceDir = "newBlocksizeBufferOverflow/insertions";
 
         Set<File> files = getFiles(new File(MpqTests.class.getClassLoader().getResource("./" + resourceDir + "/").getFile()));
 

diff --git a/...lowInsertions/Units/CommonAbilityFunc.txt → ...ow/insertions/Units/CommonAbilityFunc.txt b/...lowInsertions/Units/CommonAbilityFunc.txt → ...ow/insertions/Units/CommonAbilityFunc.txt
diff --git a/...flowInsertions/Units/HumanAbilityFunc.txt → ...low/insertions/Units/HumanAbilityFunc.txt b/...flowInsertions/Units/HumanAbilityFunc.txt → ...low/insertions/Units/HumanAbilityFunc.txt
diff --git a/...urces/mpqs/newBlocksizeBufferOverflow.w3x → ...erflow/mpq/newBlocksizeBufferOverflow.w3x b/...urces/mpqs/newBlocksizeBufferOverflow.w3x → ...erflow/mpq/newBlocksizeBufferOverflow.w3x