# HG changeset patch # User Matthias Bläsing # Date 1340819279 -7200 # Branch mb-patches2 # Node ID eb58e9e2897c0bb7c785834f3fa83c995640b2e1 # Parent 0226f3a042932ae10e015345e1930ebdd5a0cb3c Fix testcase (dependence on default locale of platform) diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DateTypeTest.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DateTypeTest.java --- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DateTypeTest.java +++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/DateTypeTest.java @@ -47,6 +47,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Locale; import java.util.TimeZone; import org.netbeans.junit.NbTestCase; @@ -135,7 +136,7 @@ DateFormat fmt = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, TimestampType.LOCALE); fmt.setTimeZone(TimeZone.getDefault()); - assertEquals("Make sure 'expected' is as expected", "01 August 2002 12:00:00 " + TimeZone.getDefault().getDisplayName(true, TimeZone.SHORT), fmt.format(expectedDate)); + assertEquals("Make sure 'expected' is as expected", "01 August 2002 12:00:00 " + TimeZone.getDefault().getDisplayName(true, TimeZone.SHORT, TimestampType.LOCALE), fmt.format(expectedDate)); String toConvert = DATE_FORMAT.format(expectedDate); assertEquals("Check format", "2002-08-01", toConvert);