650 - filestore message length fix

Author: the-thing

quickfixj-core/src/main/java/org/quickfixj/CharsetSupport.java

@@ -64,6 +64,10 @@ public static void setCharset(String charset) throws UnsupportedEncodingExceptio
         CharsetSupport.isStringEquivalent = isStringEquivalent(charsetInstance);
     }
 
+    public static void setDefaultCharset() throws UnsupportedEncodingException {
+        setCharset(getDefaultCharset());
+    }
+
     public static String getCharset() {
         return charset;
     }

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

@@ -63,7 +63,6 @@ public class FileStore implements MessageStore, Closeable {
     private final String sessionFileName;
     private final boolean syncWrites;
     private final int maxCachedMsgs;
-    private final String charsetEncoding = CharsetSupport.getCharset();
     private RandomAccessFile messageFileReader;
     private RandomAccessFile messageFileWriter;
     private DataOutputStream headerDataOutputStream;
@@ -350,7 +349,7 @@ private String getMessage(long offset, int size, int i) throws IOException {
             final byte[] data = new byte[size];
             messageFileReader.seek(offset);
             messageFileReader.readFully(data);
-            return new String(data, charsetEncoding);
+            return new String(data, CharsetSupport.getCharset());
         } catch (EOFException eofe) { // can't read fully
             throw new IOException("Truncated input while reading message: messageIndex=" + i
                     + ", offset=" + offset + ", expected size=" + size, eofe);
@@ -363,7 +362,8 @@ private String getMessage(long offset, int size, int i) throws IOException {
     @Override
     public boolean set(int sequence, String message) throws IOException {
         final long offset = messageFileWriter.getFilePointer();
-        final int size = message.length();
+        byte[] messageBytes = message.getBytes(CharsetSupport.getCharset());
+        final int size = messageBytes.length;
         if (messageIndex != null) {
             updateMessageIndex(sequence, offset, size);
         }
@@ -374,7 +374,7 @@ public boolean set(int sequence, String message) throws IOException {
         if (syncWrites) {
             headerFileOutputStream.getFD().sync();
         }
-        messageFileWriter.write(message.getBytes(CharsetSupport.getCharset()));
+        messageFileWriter.write(messageBytes);
         return true;
     }
 

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

@@ -89,7 +89,7 @@ public void testFieldCalculationsWithUTF8Charset() throws UnsupportedEncodingExc
         try {
             testFieldCalcuations("\u6D4B\u9A8C\u6570\u636E", 50, 16);
         } finally {
-            CharsetSupport.setCharset(CharsetSupport.getDefaultCharset());
+            CharsetSupport.setDefaultCharset();
         }
     }
 

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

@@ -19,15 +19,18 @@
 
 package quickfix;
 
+import org.quickfixj.CharsetSupport;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 public class FileStoreTest extends AbstractMessageStoreTest {
 
-    protected void tearDown() throws Exception {
+    public void tearDown() throws Exception {
         super.tearDown();
+        CharsetSupport.setDefaultCharset();
         FileStore fileStore = (FileStore) getStore();
         try {
             fileStore.closeAndDeleteFiles();
@@ -36,6 +39,7 @@ protected void tearDown() throws Exception {
         }
     }
 
+    @Override
     protected MessageStoreFactory getMessageStoreFactory() throws ConfigError, FieldConvertError {
         SessionSettings settings = new SessionSettings(getConfigurationFileName());
         // Initialize the session settings from the defaults
@@ -44,6 +48,7 @@ protected MessageStoreFactory getMessageStoreFactory() throws ConfigError, Field
         return new FileStoreFactory(settings);
     }
 
+    @Override
     protected Class<?> getMessageStoreClass() {
         return FileStore.class;
     }
@@ -118,4 +123,28 @@ public void testResetShouldNeverFail() throws Exception {
         thread.interrupt();
         thread.join();
     }
+
+    public void testSetAndGetMessageWithAsciiCharacters() throws IOException {
+        MessageStore underTest = getStore();
+        underTest.set(1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVXYZ0123456789");
+
+        List<String> messages = new ArrayList<>();
+        underTest.get(1, 1, messages);
+
+        assertEquals(1, messages.size());
+        assertEquals("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVXYZ0123456789", messages.get(0));
+    }
+
+    public void testSetAndGetMessageWithUnicodeCharacters() throws IOException {
+        CharsetSupport.setCharset("UTF-8");
+
+        MessageStore underTest = getStore();
+        underTest.set(1, "a \u00A9 \u2603 \uD834\uDF06");
+
+        List<String> messages = new ArrayList<>();
+        underTest.get(1, 1, messages);
+
+        assertEquals(1, messages.size());
+        assertEquals("a \u00A9 \u2603 \uD834\uDF06", messages.get(0));
+    }
 }

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

@@ -318,7 +318,7 @@ private void doTestMessageWithEncodedField(String charset, String text) throws E
             final Message msg = new Message(order.toString(), DataDictionaryTest.getDictionary());
             assertEquals(charset + " encoded field", text, msg.getString(EncodedText.FIELD));
         } finally {
-            CharsetSupport.setCharset(CharsetSupport.getDefaultCharset());
+            CharsetSupport.setDefaultCharset();
         }
     }
 

quickfixj-core/src/test/java/quickfix/mina/message/FIXMessageDecoderTest.java

@@ -55,24 +55,21 @@ public class FIXMessageDecoderTest {
 
     @Before
     public void setUp() throws Exception {
+        CharsetSupport.setDefaultCharset();
         decoder = new FIXMessageDecoder();
         buffer = IoBuffer.allocate(8192);
         decoderOutput = new ProtocolDecoderOutputForTest();
     }
 
     @After
     public void tearDown() throws Exception {
+        CharsetSupport.setDefaultCharset();
         buffer.clear();
     }
 
-    @Test
+    @Test(expected = UnsupportedEncodingException.class)
     public void testInvalidStringCharset() throws Exception {
-        try {
-            decoder = new FIXMessageDecoder("BOGUS");
-            fail("no exception thrown");
-        } catch (UnsupportedEncodingException e) {
-            // expected
-        }
+        decoder = new FIXMessageDecoder("BOGUS");
     }
 
     @Test
@@ -104,8 +101,6 @@ public void testWesternEuropeanDecoding() throws Exception {
             doWesternEuropeanDecodingTest();
         } catch (InvalidMessage e) {
             // expected
-        } finally {
-            CharsetSupport.setCharset(CharsetSupport.getDefaultCharset());
         }
     }
 

quickfixj-core/src/test/java/quickfix/mina/message/FIXMessageEncoderTest.java

@@ -19,12 +19,13 @@
 
 package quickfix.mina.message;
 
-import java.io.UnsupportedEncodingException;
+import org.apache.mina.filter.codec.ProtocolCodecException;
 
-import junit.framework.ComparisonFailure;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ComparisonFailure;
+import org.junit.Test;
 
-import org.apache.mina.filter.codec.ProtocolCodecException;
 import org.quickfixj.CharsetSupport;
 
 import quickfix.Message;
@@ -34,13 +35,25 @@
 import quickfix.fix40.Logon;
 import quickfix.fix44.News;
 
-public class FIXMessageEncoderTest extends TestCase {
+import java.io.UnsupportedEncodingException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class FIXMessageEncoderTest {
 
+    @Before
+    public void setUp() throws UnsupportedEncodingException {
+        CharsetSupport.setDefaultCharset();
+    }
+
+    @After
     public void tearDown() throws UnsupportedEncodingException {
-        // reset charset after every test
-        CharsetSupport.setCharset(CharsetSupport.getDefaultCharset());
+        CharsetSupport.setDefaultCharset();
     }
 
+    @Test
     public void testEncoding() throws Exception {
         FIXMessageEncoder encoder = new FIXMessageEncoder();
         Message message = new Logon();
@@ -51,6 +64,7 @@ public void testEncoding() throws Exception {
         assertTrue(protocolEncoderOutputForTest.buffer.limit() > 0);
     }
 
+    @Test
     public void testWesternEuropeanEncoding() throws Exception {
         String headline = "\u00E4bcf\u00F6d\u00E7\u00E9";
 
@@ -67,6 +81,7 @@ public void testWesternEuropeanEncoding() throws Exception {
         }
     }
 
+    @Test
     public void testChineseEncoding() throws Exception {
         String headline = "\u6D4B\u9A8C\u6570\u636E";
 
@@ -96,29 +111,26 @@ private void doEncodingTest(String headline) throws ProtocolCodecException, Unsu
         assertEquals("wrong encoding", new String(bytes, CharsetSupport.getCharset()), news.toString());
     }
 
+    @Test(expected = ProtocolCodecException.class)
     public void testEncodingBadType() throws Exception {
         FIXMessageEncoder encoder = new FIXMessageEncoder();
-        try {
-            encoder.encode(null, new Object(), new ProtocolEncoderOutputForTest());
-            fail("expected exception");
-        } catch (ProtocolCodecException e) {
-            // expected
-        }
+        encoder.encode(null, new Object(), new ProtocolEncoderOutputForTest());
     }
 
+    @Test
     public void testEncodingStringEnglish() throws Exception {
         FIXMessageEncoder encoder = new FIXMessageEncoder();
         ProtocolEncoderOutputForTest protocolEncoderOutputForTest = new ProtocolEncoderOutputForTest();
         encoder.encode(null, "abcd", protocolEncoderOutputForTest);
         assertEquals(4, protocolEncoderOutputForTest.buffer.limit());
     }
 
+    @Test
     public void testEncodingStringChinese() throws Exception {
         CharsetSupport.setCharset("UTF-8");
         FIXMessageEncoder encoder = new FIXMessageEncoder();
         ProtocolEncoderOutputForTest protocolEncoderOutputForTest = new ProtocolEncoderOutputForTest();
         encoder.encode(null, "\u6D4B\u9A8C\u6570\u636E", protocolEncoderOutputForTest);
         assertEquals(12, protocolEncoderOutputForTest.buffer.limit());
     }
-
 }