Merge pull request #27 from kimptoc/data-dict-copy-from-fix

add missing variables to copyFrom, include in tests

Author: chrjohn

quickfixj-core/src/main/java/quickfix/DataDictionary.java

@@ -474,6 +474,18 @@ public boolean isCheckUnorderedGroupFields() {
         return checkUnorderedGroupFields;
     }
 
+    public boolean isCheckFieldsHaveValues() {
+        return checkFieldsHaveValues;
+    }
+
+    public boolean isCheckUserDefinedFields() {
+        return checkUserDefinedFields;
+    }
+
+    public boolean isAllowUnknownMessageFields() {
+        return allowUnknownMessageFields;
+    }
+
     /**
      * Controls whether group fields are in the same order
      *
@@ -523,6 +535,8 @@ private void copyFrom(DataDictionary rhs) {
         checkFieldsOutOfOrder = rhs.checkFieldsOutOfOrder;
         checkFieldsHaveValues = rhs.checkFieldsHaveValues;
         checkUserDefinedFields = rhs.checkUserDefinedFields;
+        checkUnorderedGroupFields = rhs.checkUnorderedGroupFields;
+        allowUnknownMessageFields = rhs.allowUnknownMessageFields;
 
         copyMap(messageFields, rhs.messageFields);
         copyMap(requiredFields, rhs.requiredFields);
@@ -997,6 +1011,10 @@ private void load(InputStream inputStream) throws ConfigError {
         }
     }
 
+    public int getNumMessageCategories() {
+        return messageCategory.size();
+    }
+
     private void load(Document document, String msgtype, Node node) throws ConfigError {
         String name;
         final NodeList fieldNodes = node.getChildNodes();

quickfixj-core/src/test/java/quickfix/DataDictionaryTest.java

@@ -196,6 +196,9 @@ public void testHeaderTrailerRequired() throws Exception {
         data += "</fix>";
 
         DataDictionary dd = new DataDictionary(new ByteArrayInputStream(data.getBytes()));
+        assertEquals(1, dd.getNumMessageCategories());
+        assertEquals("0", dd.getMsgType("Heartbeat"));
+
         assertTrue("BeginString should be required", dd.isRequiredHeaderField(8));
         assertFalse("OnBehalfOfCompID should not be required", dd.isRequiredHeaderField(115));
         assertTrue("Checksum should be required", dd.isRequiredTrailerField(10));
@@ -428,6 +431,25 @@ public void testNewOrderSingleWithMisplacedTag50() throws Exception {
         assertTrue(nos4.getHeader().isSetField(new SenderSubID()));
     }
 
+    public void testCopy() throws Exception {
+        final DataDictionary dataDictionary = new DataDictionary(getDictionary());
+
+        dataDictionary.setAllowUnknownMessageFields(true);
+        dataDictionary.setCheckFieldsHaveValues(false);
+        dataDictionary.setCheckFieldsOutOfOrder(false);
+        dataDictionary.setCheckUnorderedGroupFields(false);
+        dataDictionary.setCheckUserDefinedFields(false);
+
+        DataDictionary ddCopy = new DataDictionary(dataDictionary);
+
+        assertEquals(ddCopy.isAllowUnknownMessageFields(),dataDictionary.isAllowUnknownMessageFields());
+        assertEquals(ddCopy.isCheckFieldsHaveValues(),dataDictionary.isCheckFieldsHaveValues());
+        assertEquals(ddCopy.isCheckFieldsOutOfOrder(),dataDictionary.isCheckFieldsOutOfOrder());
+        assertEquals(ddCopy.isCheckUnorderedGroupFields(),dataDictionary.isCheckUnorderedGroupFields());
+        assertEquals(ddCopy.isCheckUserDefinedFields(),dataDictionary.isCheckUserDefinedFields());
+
+    }
+
     //
     // Group Validation Tests in RepeatingGroupTest
     //