github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#2271] jOOQ Unit tests fail when not run in CET / CEST

Browse Source
This commit is contained in:
Lukas Eder 2013-02-26 12:23:32 +01:00
parent 46384c000a
commit 9fb08f7d39
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jOOQ/src/test/java/org/jooq/test/AbstractTest.java
View File

@ -39,7 +39,10 @@ import static org.jooq.test.data.Table1.FIELD_ID1;
import static org.jooq.test.data.Table1.FIELD_NAME1;
import static org.jooq.test.data.Table1.TABLE1;
import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.Time;
import java.sql.Timestamp;
import org.jooq.BindContext;
import org.jooq.RenderContext;
@ -158,4 +161,16 @@ public abstract class AbstractTest {
protected final RenderContext r_refP() {
return r_ref().namedParams(true);
}
protected final String zeroDate() {
return new Date(0).toString();
}
protected final String zeroTime() {
return new Time(0).toString();
}
protected final String zeroTimestamp() {
return new Timestamp(0).toString();
}
}

4
jOOQ/src/test/java/org/jooq/test/BasicTest.java
View File

@ -1516,7 +1516,7 @@ public class BasicTest extends AbstractTest {
q.addValue(FIELD_ID1, 10);
q.addValue(FIELD_NAME1, "ABC");
q.addValue(FIELD_DATE1, new Date(0));
assertEquals("insert into \"TABLE1\" (\"ID1\", \"NAME1\", \"DATE1\") values (10, 'ABC', date '1970-01-01')", r_refI().render(q));
assertEquals("insert into \"TABLE1\" (\"ID1\", \"NAME1\", \"DATE1\") values (10, 'ABC', date '" + zeroDate() + "')", r_refI().render(q));
assertEquals("insert into \"TABLE1\" (\"ID1\", \"NAME1\", \"DATE1\") values (?, ?, ?)", r_ref().render(q));
assertEquals(q, create.insertInto(TABLE1, FIELD_ID1, FIELD_NAME1, FIELD_DATE1).values(10, "ABC", new Date(0)));
assertEquals(q, create.insertInto(TABLE1).set(FIELD_ID1, 10).set(FIELD_NAME1, "ABC").set(FIELD_DATE1, new Date(0)));
@ -1723,7 +1723,7 @@ public class BasicTest extends AbstractTest {
.whenNotMatchedThenInsert(FIELD_ID1, FIELD_NAME1, FIELD_DATE1)
.values(1, "name", new Date(0));
assertEquals("merge into \"TABLE1\" using (select \"TABLE2\".\"ID2\" from \"TABLE2\") on ((\"TABLE2\".\"ID2\" = \"TABLE1\".\"ID1\" and \"TABLE1\".\"ID1\" = 1) or \"TABLE2\".\"ID2\" = 2) when matched then update set \"TABLE1\".\"NAME1\" = 'name', \"TABLE1\".\"DATE1\" = date '1970-01-01' when not matched then insert (\"ID1\", \"NAME1\", \"DATE1\") values (1, 'name', date '1970-01-01')", r_refI().render(q));
assertEquals("merge into \"TABLE1\" using (select \"TABLE2\".\"ID2\" from \"TABLE2\") on ((\"TABLE2\".\"ID2\" = \"TABLE1\".\"ID1\" and \"TABLE1\".\"ID1\" = 1) or \"TABLE2\".\"ID2\" = 2) when matched then update set \"TABLE1\".\"NAME1\" = 'name', \"TABLE1\".\"DATE1\" = date '" + zeroDate() + "' when not matched then insert (\"ID1\", \"NAME1\", \"DATE1\") values (1, 'name', date '" + zeroDate() + "')", r_refI().render(q));
assertEquals("merge into \"TABLE1\" using (select \"TABLE2\".\"ID2\" from \"TABLE2\") on ((\"TABLE2\".\"ID2\" = \"TABLE1\".\"ID1\" and \"TABLE1\".\"ID1\" = ?) or \"TABLE2\".\"ID2\" = ?) when matched then update set \"TABLE1\".\"NAME1\" = ?, \"TABLE1\".\"DATE1\" = ? when not matched then insert (\"ID1\", \"NAME1\", \"DATE1\") values (?, ?, ?)", r_ref().render(q));
context.checking(new Expectations() {{

8
jOOQ/src/test/java/org/jooq/test/ConvertTest.java
View File

@ -56,7 +56,7 @@ import org.junit.Test;
*
* @author Lukas Eder
*/
public class ConvertTest {
public class ConvertTest extends AbstractTest {
@Test
public void testToObject() {
@ -89,9 +89,9 @@ public class ConvertTest {
testConversion("1.0", 1.0f, String.class);
testConversion("1", BigInteger.ONE, String.class);
testConversion("1", BigDecimal.ONE, String.class);
testConversion("1970-01-01", new Date(0), String.class);
testConversion("01:00:00", new Time(0), String.class);
testConversion("1970-01-01 01:00:00.0", new Timestamp(0), String.class);
testConversion(zeroDate(), new Date(0), String.class);
testConversion(zeroTime(), new Time(0), String.class);
testConversion(zeroTimestamp(), new Timestamp(0), String.class);
}
@Test