improve unit tests

Querz · Dec 17, 2018 · f1f2c54 · f1f2c54
1 parent 152bccf
commit f1f2c54
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 5 deletions.
diff --git a/src/main/java/net/querz/nbt/ArrayTag.java b/src/main/java/net/querz/nbt/ArrayTag.java
@@ -2,6 +2,11 @@
 
 import java.lang.reflect.Array;
 
+/**
+ * ArrayTag is an abstract representation of any NBT array tag.
+ * For implementations see {@link ByteArrayTag}, {@link IntArrayTag}, {@link LongArrayTag}.
+ * @param <T> The array type.
+ * */
 public abstract class ArrayTag<T> extends Tag<T> {
 
 	public ArrayTag() {}

diff --git a/src/main/java/net/querz/nbt/mca/MCAFile.java b/src/main/java/net/querz/nbt/mca/MCAFile.java
@@ -80,6 +80,10 @@ public int serialize(RandomAccessFile raf, boolean changeLastUpdate) throws IOEx
 		int chunkXOffset = MCAUtil.regionToChunk(regionX);
 		int chunkZOffset = MCAUtil.regionToChunk(regionZ);
 
+		if (chunks == null) {
+			return 0;
+		}
+
 		for (int cx = 0; cx < 32; cx++) {
 			for (int cz = 0; cz < 32; cz++) {
 				int index = getChunkIndex(cx, cz);
@@ -104,15 +108,15 @@ public int serialize(RandomAccessFile raf, boolean changeLastUpdate) throws IOEx
 				raf.writeByte(globalOffset & 0xFF);
 				raf.writeByte(sectors);
 
-				//write timestamp to tmp file
+				// write timestamp
 				raf.seek(index * 4 + 4096);
 				raf.writeInt(changeLastUpdate ? timestamp : chunk.getLastMCAUpdate());
 
 				globalOffset += sectors;
 			}
 		}
 
-		//padding
+		// padding
 		if (lastWritten % 4096 != 0) {
 			raf.seek(globalOffset * 4096 - 1);
 			raf.write(0);

diff --git a/src/test/java/net/querz/nbt/NBTTestCase.java b/src/test/java/net/querz/nbt/NBTTestCase.java
@@ -28,7 +28,7 @@ public void tearDown() throws Exception {
 		TagFactory.unregisterCustomTag(100);
 		TagFactory.unregisterCustomTag(110);
 		TagFactory.unregisterCustomTag(120);
-		cleanupTmpDir();
+//		cleanupTmpDir();
 	}
 
 	protected byte[] serialize(Tag<?> tag) {
@@ -151,10 +151,16 @@ protected <T, E extends Exception> void assertThrowsException(ExceptionSupplier<
 	}
 
 	protected <T, E extends Exception> T assertThrowsNoException(ExceptionSupplier<T, E> r) {
+		return assertThrowsNoException(r, false);
+	}
+
+	protected <T, E extends Exception> T assertThrowsNoException(ExceptionSupplier<T, E> r, boolean printStackTrace) {
 		try {
 			return r.run();
 		} catch (Exception ex) {
-			ex.printStackTrace();
+			if (printStackTrace) {
+				ex.printStackTrace();
+			}
 			TestCase.fail("Threw exception " + ex.getClass().getName() + " with message \"" + ex.getMessage() + "\"");
 		}
 		return null;
@@ -218,6 +224,15 @@ protected File getNewTmpFile(String name) {
 		return tmpFile;
 	}
 
+	protected File getTmpFile(String name) {
+		String workingDir = System.getProperty("user.dir");
+		File tmpDir = new File(workingDir, "tmp");
+		if (!tmpDir.exists()) {
+			tmpDir.mkdirs();
+		}
+		return new File(tmpDir, name);
+	}
+
 	protected File copyResourceToTmp(String resource) {
 		URL resFileURL = getClass().getClassLoader().getResource(resource);
 		TestCase.assertNotNull(resFileURL);

diff --git a/src/test/java/net/querz/nbt/TagTest.java b/src/test/java/net/querz/nbt/TagTest.java
@@ -62,5 +62,14 @@ public void testMakeMyCoverageGreatAgain() {
 		assertThrowsException(() -> NBTUtil.writeTag(null, (File) null), NullPointerException.class);
 		assertThrowsException(() -> NBTUtil.writeTag(null, null, (File) null, false), NullPointerException.class);
 		assertThrowsException(() -> NBTUtil.writeTag(null, null, (String) null, false), NullPointerException.class);
+
+		CompoundTag dummy = new CompoundTag();
+		assertThrowsNoException(() -> NBTUtil.writeTag(dummy, getNewTmpFile("coverage.dat")));
+		assertThrowsNoException(() -> NBTUtil.writeTag(dummy, getNewTmpFile("coverage.dat").getAbsolutePath()));
+		assertThrowsNoException(() -> NBTUtil.writeTag(dummy, getNewTmpFile("coverage.dat"), true));
+		assertThrowsNoException(() -> NBTUtil.writeTag(dummy, getNewTmpFile("coverage.dat").getAbsolutePath(), true));
+		assertThrowsNoException(() -> NBTUtil.writeTag(dummy, "foo", getNewTmpFile("coverage.dat")));
+		assertThrowsNoException(() -> NBTUtil.writeTag(dummy, "foo", getNewTmpFile("coverage.dat").getAbsolutePath()));
+		assertThrowsNoException(() -> NBTUtil.writeTag(dummy, "foo", getNewTmpFile("coverage.dat").getAbsolutePath(), true));
 	}
 }
diff --git a/src/test/java/net/querz/nbt/mca/MCAUtilTest.java b/src/test/java/net/querz/nbt/mca/MCAUtilTest.java
@@ -80,6 +80,12 @@ public void testMakeMyCoverageGreatAgain() {
 		assertThrowsException(() -> MCAUtil.writeMCAFile(null, (File) null), NullPointerException.class);
 		assertThrowsException(() -> MCAUtil.writeMCAFile(null, (String) null, false), NullPointerException.class);
 		assertThrowsException(() -> MCAUtil.readMCAFile("r.a.b.mca"), IllegalArgumentException.class);
-		assertThrowsException(() -> new MCAFile(0, 0).serialize(null), NullPointerException.class);
+		assertThrowsNoException(() -> new MCAFile(0, 0).serialize(null)); // empty MCAFile will not even attempt to write to file
+
+		// test overwriting file
+		MCAFile m = new MCAFile(0, 0);
+		m.setChunk(0, Chunk.newChunk());
+		assertThrowsNoException(() -> MCAUtil.writeMCAFile(m, getTmpFile("r.0.0.mca"), false), true);
+		assertThrowsNoException(() -> MCAUtil.writeMCAFile(m, getTmpFile("r.0.0.mca"), false), true);
 	}
 }