From 10540b76f80356dbe6b33ac3b9f8ece1b58d4889 Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Mon, 9 Sep 2019 08:56:41 -0700
Subject: [PATCH] Hobbit cards can now be stored in collections

---
 .../collection/CollectionSerializer.java      |   3 +++
 .../collection/CollectionSerializerTest.java  |  21 ++++++++++++++++++
 .../src/test/resources/testCollection-v4      | Bin 0 -> 6878 bytes
 3 files changed, 24 insertions(+)
 create mode 100644 gemp-lotr/gemp-lotr-server/src/test/resources/testCollection-v4

diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java
index 43c7be8e0..e93032c3b 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java
@@ -51,6 +51,9 @@ public class CollectionSerializer {
 
         _singleByteCountItems.add("gl_theOneRing");
         _singleByteCountItems.add("gl_theOneRing*");
+
+        loadSet("30");
+        loadSet("31");
     }
 
     private void fillDoubleByteItems() throws IOException {
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/collection/CollectionSerializerTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/collection/CollectionSerializerTest.java
index 7b8a070f5..68bbb946d 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/collection/CollectionSerializerTest.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/collection/CollectionSerializerTest.java
@@ -60,6 +60,27 @@ public class CollectionSerializerTest {
         }
     }
 
+    @Test
+    public void deserializeFromBytesV4() throws IOException {
+        InputStream is = CollectionSerializerTest.class.getResourceAsStream("/testCollection-v4");
+        try {
+            CardCollection resultCollection = _serializer.deserializeCollection(is);
+            assertEquals(7, Iterables.size(resultCollection.getAll()));
+            assertEquals(256 * 256 * 250, resultCollection.getCurrency());
+            assertEquals(2, resultCollection.getItemCount("1_1"));
+            assertEquals(3, resultCollection.getItemCount("1_231T"));
+            assertEquals(3, resultCollection.getItemCount("1_23*"));
+            assertEquals(3, resultCollection.getItemCount("1_237T*"));
+            assertEquals(3, resultCollection.getItemCount("15_2"));
+            assertEquals(3, resultCollection.getItemCount("15_4*"));
+            assertEquals(2, resultCollection.getItemCount("FotR - Booster"));
+            assertEquals(1, resultCollection.getExtraInformation().size());
+            assertEquals("b", resultCollection.getExtraInformation().get("a"));
+        } finally {
+            IOUtils.closeQuietly(is);
+        }
+    }
+
     @Test
     public void testExtraInfo() throws IOException {
         DefaultCardCollection collection = new DefaultCardCollection();
diff --git a/gemp-lotr/gemp-lotr-server/src/test/resources/testCollection-v4 b/gemp-lotr/gemp-lotr-server/src/test/resources/testCollection-v4
new file mode 100644
index 0000000000000000000000000000000000000000..21ad8f13428f0e1aa97c9dd2310dfb9e35ce9dab
GIT binary patch
literal 6878
zcmeI$p$&jQ3<b~&FarYFF_;AdYY-Mkk-({wsB7|Sn!4Xt*Xb^0D_;$@r)kUlBl4JL
zJwdBLbFyZ{M1TMR0t5&UAV7cs0RjXF5FkK+KyL!?6VE5Fx3kDYAicmDd#rK9^#H(?
B1RDSV

literal 0
HcmV?d00001