From 0b47ff0e0f7b40b8c09a8bccda8d174461a443d4 Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Tue, 27 Nov 2012 12:16:15 -0500 Subject: [PATCH] Fix test cases to use time zone offsets Signed-off-by: Matthew Khouzam Change-Id: Icfbef5df8913f1fd34486b85a9016f0176c874ec Reviewed-on: https://git.eclipse.org/r/8866 Reviewed-by: Patrick Tasse IP-Clean: Patrick Tasse --- .../tests/event/TmfSimpleTimestampTest.java | 14 +++++++++++--- .../tmf/core/tests/event/TmfTimestampTest.java | 17 +++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java index e2a6ce7f6b..7357d51b85 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java @@ -12,6 +12,10 @@ package org.eclipse.linuxtools.tmf.core.tests.event; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + import junit.framework.TestCase; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; @@ -177,9 +181,13 @@ public class TmfSimpleTimestampTest extends TestCase { * */ public void testToString() { - assertEquals("toString", "00:00:00.000 000 000", ts0.toString()); - assertEquals("toString", "03:25:45.000 000 000", ts1.toString()); - assertEquals("toString", "23:39:26.000 000 000", ts2.toString()); + DateFormat df = new SimpleDateFormat("HH:mm:ss.SSS"); + Date d0 = new Date(ts0.getValue()*1000); + Date d1 = new Date(ts1.getValue()*1000); + Date d2 = new Date(ts2.getValue()*1000); + assertEquals("toString", df.format(d0) + " 000 000", ts0.toString()); + assertEquals("toString", df.format(d1) + " 000 000", ts1.toString()); + assertEquals("toString", df.format(d2) + " 000 000", ts2.toString()); } // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java index ef20328ed9..7582f86e6d 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java @@ -13,6 +13,10 @@ package org.eclipse.linuxtools.tmf.core.tests.event; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + import junit.framework.TestCase; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; @@ -249,10 +253,15 @@ public class TmfTimestampTest extends TestCase { * */ public void testToStringDefault() { - assertEquals("toString", "00:00:00.000 000 000", ts0.toString()); - assertEquals("toString", "03:25:45.000 000 000", ts1.toString()); - assertEquals("toString", "00:20:34.500 000 000", ts2.toString()); - assertEquals("toString", "06:55:00.000 000 000", ts3.toString()); + DateFormat df = new SimpleDateFormat("HH:mm:ss.SSS"); + Date d0 = new Date(ts0.getValue() * (long) Math.pow(10, ts0.getScale() + 3)); + Date d1 = new Date(ts1.getValue() * (long) Math.pow(10, ts1.getScale() + 3)); + Date d2 = new Date(ts2.getValue() * (long) Math.pow(10, ts2.getScale() + 3)); + Date d3 = new Date(ts3.getValue() * (long) Math.pow(10, ts3.getScale() + 3)); + assertEquals("toString", df.format(d0) + " 000 000", ts0.toString()); + assertEquals("toString", df.format(d1) + " 000 000", ts1.toString()); + assertEquals("toString", df.format(d2) + " 000 000", ts2.toString()); + assertEquals("toString", df.format(d3) + " 000 000", ts3.toString()); } /** -- 2.34.1