This is an automated email from the git hooks/post-receive script. bengen pushed a commit to annotated tag jackson-dataformat-smile-2.0.0 in repository jackson-dataformat-smile.
commit 5231d72e30990366a4b5bd33aa3e7be028c72767 Merge: 2ebb8a0 1a6b60f Author: Tatu Saloranta <[email protected]> Date: Wed Dec 28 17:01:06 2011 -0800 Merge branch 'master' of github.com:FasterXML/jackson-dataformat-smile Conflicts: src/test/java/com/fasterxml/jackson/dataformat/smile/SmileTestBase.java .../jackson/dataformat/smile/SmileParser.java | 14 ++++++++++ .../jackson/dataformat/smile/SmileTestBase.java | 16 ++++++++++- .../jackson/dataformat/smile/TestMapper.java | 29 ++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --cc src/test/java/com/fasterxml/jackson/dataformat/smile/SmileTestBase.java index a134b80,2457f8d..c01a509 --- a/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileTestBase.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileTestBase.java @@@ -6,7 -6,8 +6,8 @@@ import java.util.Arrays import org.junit.Assert; -import org.codehaus.jackson.*; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.*; ++import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.smile.SmileFactory; import com.fasterxml.jackson.dataformat.smile.SmileGenerator; diff --cc src/test/java/com/fasterxml/jackson/dataformat/smile/TestMapper.java index 0000000,64ead5f..93cf6ba mode 000000,100644..100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/smile/TestMapper.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/smile/TestMapper.java @@@ -1,0 -1,28 +1,29 @@@ + package com.fasterxml.jackson.dataformat.smile; + + import java.io.IOException; + -import org.codehaus.jackson.map.ObjectMapper; + import org.junit.Assert; + ++import com.fasterxml.jackson.databind.ObjectMapper; ++ + public class TestMapper extends SmileTestBase + { + static class BytesBean { + public byte[] bytes; + + public BytesBean() { } + public BytesBean(byte[] b) { bytes = b; } + } + + // [JACKSON-733] + public void testBinary() throws IOException + { + byte[] input = new byte[] { 1, 2, 3, -1, 8, 0, 42 }; + ObjectMapper mapper = smileMapper(); + byte[] smile = mapper.writeValueAsBytes(new BytesBean(input)); + BytesBean result = mapper.readValue(smile, BytesBean.class); + + assertNotNull(result.bytes); + Assert.assertArrayEquals(input, result.bytes); + } + } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-dataformat-smile.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
