fix merge conflict

4 files changed, 31 insertions, 1 deletions

diff --git a/azalea-nbt/tests/inttest1023.nbt b/azalea-nbt/tests/inttest1023.nbt
new file mode 100644
index 00000000..481dde19
--- /dev/null
+++ b/azalea-nbt/tests/inttest1023.nbt
diff --git a/azalea-nbt/tests/inttest.nbt b/azalea-nbt/tests/inttest16.nbt
index ad9255f2..ad9255f2 100755
--- a/azalea-nbt/tests/inttest.nbt
+++ b/azalea-nbt/tests/inttest16.nbt
diff --git a/azalea-nbt/tests/inttest3.nbt b/azalea-nbt/tests/inttest3.nbt
new file mode 100644
index 00000000..2890f577
--- /dev/null
+++ b/azalea-nbt/tests/inttest3.nbt
diff --git a/azalea-nbt/tests/tests.rs b/azalea-nbt/tests/tests.rs
index a7f6912f..5c82c3c7 100755
--- a/azalea-nbt/tests/tests.rs
+++ b/azalea-nbt/tests/tests.rs
@@ -1,4 +1,4 @@
-use azalea_nbt::{NbtCompound, NbtList, Nbt};
+use azalea_nbt::{Nbt, NbtCompound, NbtList};
 use std::io::Cursor;
 
 #[test]
@@ -108,3 +108,33 @@ fn test_simple_player() {
 
     assert_eq!(decoded_tag, original_tag);
 }
+
+// #[test]
+// fn test_inttest() {
+//     let original = include_bytes!("inttest.nbt").to_vec();
+
+//     let mut original_stream = Cursor::new(original);
+//     let original_tag = Nbt::read_gzip(&mut original_stream).unwrap();
+
+//     let mut result = Vec::new();
+//     original_tag.write(&mut result);
+
+//     let decoded_tag = Nbt::read(&mut Cursor::new(&result)).unwrap();
+
+//     assert_eq!(decoded_tag, original_tag);
+// }
+
+#[test]
+fn test_inttest1023() {
+    let original = include_bytes!("inttest1023.nbt").to_vec();
+
+    let mut original_stream = Cursor::new(original.as_slice());
+    let original_tag = Nbt::read(&mut original_stream).unwrap();
+
+    let mut result = Vec::new();
+    original_tag.write(&mut result);
+
+    let decoded_tag = Nbt::read(&mut Cursor::new(&result)).unwrap();
+
+    assert_eq!(decoded_tag, original_tag);
+}