Projects >> jackson-databind >>386e9f7ba59a28602e12c7ac2689590998c237c4

Chunk
Conflicting content
        assertEquals(aposToQuotes("{'date':0}"), MAPPER.writeValueAsString(new SqlDateAsNumberBean(0L)));
    }

<<<<<<< HEAD:src/test/java/com/fasterxml/jackson/databind/ser/DateSerializationTest.java
    public void testSqlTime() throws IOException
    {
        java.sql.Time time = new java.sql.Time(0L);
        // not 100% sure what we should expect wrt timezone, but what serializes
        // does use is quite simple:
        assertEquals(quote(time.toString()), MAPPER.writeValueAsString(time));
=======
    public void testSqlTimestamp() throws IOException
    {
        java.sql.Timestamp input = new java.sql.Timestamp(0L);
        // just should produce same output as standard `java.util.Date`:
        Date altTnput = new Date(0L);
        assertEquals(MAPPER.writeValueAsString(altTnput),
                MAPPER.writeValueAsString(input));
    }

    public void testSqlTime() throws IOException
    {
        java.sql.Time input = new java.sql.Time(0L);
        assertEquals(quote(input.toString()), MAPPER.writeValueAsString(input));
>>>>>>> 70d961bfb281498489eeb7d318bc5c96fa7f92e6:src/test/java/com/fasterxml/jackson/databind/ser/TestDateSerialization.java
    }
    
    public void testTimeZone() throws IOException
Solution content
        assertEquals(aposToQuotes("{'date':0}"), MAPPER.writeValueAsString(new SqlDateAsNumberBean(0L)));
    }

    public void testSqlTime() throws IOException
    {
        java.sql.Time time = new java.sql.Time(0L);
        // not 100% sure what we should expect wrt timezone, but what serializes
        // does use is quite simple:
        assertEquals(quote(time.toString()), MAPPER.writeValueAsString(time));
    }

    public void testSqlTimestamp() throws IOException
    {
        java.sql.Timestamp input = new java.sql.Timestamp(0L);
        // just should produce same output as standard `java.util.Date`:
        Date altTnput = new Date(0L);
        assertEquals(MAPPER.writeValueAsString(altTnput),
                MAPPER.writeValueAsString(input));
    }

    public void testTimeZone() throws IOException
File
DateSerializationTest.java
Developer's decision
Combination
Kind of conflict
Comment
Method declaration
Method invocation
Method signature
Variable