From: Marc-Andre Laperle Date: Sat, 13 Feb 2016 15:23:01 +0000 (+0100) Subject: tmf: Fix some tests not working in different time zones X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=6941941dae561c9e2b1c250d66e45e24ffae6cce;p=deliverable%2Ftracecompass.git tmf: Fix some tests not working in different time zones Also print the timezone at the start of test to help troubleshoot if it happens on a server. Change-Id: I4cd10054f4c767a4089e17447089e401ade19b6e Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/66579 Reviewed-by: Hudson CI Reviewed-by: Bernd Hufmann Tested-by: Bernd Hufmann --- diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/SWTBotUtils.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/SWTBotUtils.java index da11de540d..652c459403 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/SWTBotUtils.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/SWTBotUtils.java @@ -17,6 +17,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.List; +import java.util.TimeZone; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -309,6 +310,8 @@ public final class SWTBotUtils { } } + System.out.println("Time zone: " + TimeZone.getDefault().getDisplayName()); + fPrintedEnvironment = true; } diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterViewerTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterViewerTest.java index b54dd736df..c64642ac18 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterViewerTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterViewerTest.java @@ -20,6 +20,8 @@ import java.io.IOException; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.SWTBot; @@ -30,7 +32,10 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.eclipse.tracecompass.internal.tmf.core.Activator; import org.eclipse.tracecompass.tmf.core.io.BufferedRandomAccessFile; +import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimePreferencesConstants; +import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.ConditionHelpers; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; import org.eclipse.tracecompass.tmf.ui.views.filter.FilterView; @@ -83,6 +88,10 @@ public class FilterViewerTest { */ @BeforeClass public static void init() throws IOException { + IEclipsePreferences defaultPreferences = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID); + defaultPreferences.put(ITmfTimePreferencesConstants.TIME_ZONE, "GMT-05:00"); + TmfTimestampFormat.updateDefaultFormats(); + SWTBotUtils.initialize(); Thread.currentThread().setName("SWTBot Thread"); // for the debugger /* set up for swtbot */ @@ -128,6 +137,10 @@ public class FilterViewerTest { SWTBotUtils.deleteProject(PROJECT_NAME, fBot); fLogger.removeAllAppenders(); SWTBotUtils.closeViewById(FilterView.ID, fBot); + + IEclipsePreferences defaultPreferences = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID); + defaultPreferences.put(ITmfTimePreferencesConstants.TIME_ZONE, "Local Time"); + TmfTimestampFormat.updateDefaultFormats(); } /** @@ -251,6 +264,7 @@ public class FilterViewerTest { String ret = applyFilter(fBot, filterName); assertEquals("26/100", ret); +// filterNodeBot.contextMenu().menu("Delete").click(); } /** @@ -301,6 +315,7 @@ public class FilterViewerTest { viewBot.toolbarButton("Save filters").click(); String ret = applyFilter(fBot, filterName); +// filterNodeBot.contextMenu().menu("Delete").click(); assertEquals("50/100", ret); } diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestTraceOffsetting.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestTraceOffsetting.java index 57f26de5c4..231b8a0050 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestTraceOffsetting.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestTraceOffsetting.java @@ -24,6 +24,8 @@ import java.util.regex.Pattern; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.bindings.keys.KeyStroke; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; @@ -33,7 +35,10 @@ import org.eclipse.swtbot.swt.finder.utils.SWTUtils; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.eclipse.tracecompass.internal.tmf.core.Activator; import org.eclipse.tracecompass.tmf.core.io.BufferedRandomAccessFile; +import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimePreferencesConstants; +import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.ConditionHelpers; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; import org.junit.After; @@ -84,6 +89,10 @@ public class TestTraceOffsetting { fLogger.addAppender(new ConsoleAppender(new SimpleLayout())); fBot = new SWTWorkbenchBot(); + IEclipsePreferences defaultPreferences = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID); + defaultPreferences.put(ITmfTimePreferencesConstants.TIME_ZONE, "GMT-05:00"); + TmfTimestampFormat.updateDefaultFormats(); + SWTBotUtils.closeView("welcome", fBot); SWTBotUtils.switchToTracingPerspective(); @@ -106,6 +115,10 @@ public class TestTraceOffsetting { public void cleanup() { fLocation.delete(); fLogger.removeAllAppenders(); + + IEclipsePreferences defaultPreferences = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID); + defaultPreferences.put(ITmfTimePreferencesConstants.TIME_ZONE, "Local Time"); + TmfTimestampFormat.updateDefaultFormats(); } /**