From 9d8a90ad87bfc2ade14e6408359062d0e403656b Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Mon, 27 Feb 2012 08:50:29 -0500 Subject: [PATCH] Fix tests --- .../ui/tests/control/model/impl/BaseEventInfoTest.java | 8 ++++---- .../lttng/ui/tests/control/model/impl/DomainInfoTest.java | 4 ++-- .../lttng/ui/tests/control/model/impl/EventInfoTest.java | 8 ++++---- .../ui/tests/control/model/impl/SessionInfoTest.java | 2 +- .../ui/tests/control/service/LTTngControlServiceTest.java | 4 ++-- .../lttng/stubs/service/shells/NoSessionNamesShell.java | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/BaseEventInfoTest.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/BaseEventInfoTest.java index 2fefc8741a..e2ba28a122 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/BaseEventInfoTest.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/BaseEventInfoTest.java @@ -75,7 +75,7 @@ public class BaseEventInfoTest extends TestCase { assertEquals("unknown", result.getInName()); assertEquals("UNKNOWN", result.name()); assertEquals("UNKNOWN", result.toString()); - assertEquals(1, result.ordinal()); + assertEquals(2, result.ordinal()); TraceLogLevel level = fixture.getLogLevel(); assertEquals("TRACE_DEBUG", level.getInName()); @@ -125,14 +125,14 @@ public class BaseEventInfoTest extends TestCase { assertEquals("unknown", result.getInName()); assertEquals("UNKNOWN", result.name()); assertEquals("UNKNOWN", result.toString()); - assertEquals(1, result.ordinal()); + assertEquals(2, result.ordinal()); fixture.setEventType(""); result = fixture.getEventType(); assertEquals("unknown", result.getInName()); assertEquals("UNKNOWN", result.name()); assertEquals("UNKNOWN", result.toString()); - assertEquals(1, result.ordinal()); + assertEquals(2, result.ordinal()); fixture.setEventType("tracepoint"); result = fixture.getEventType(); @@ -166,7 +166,7 @@ public class BaseEventInfoTest extends TestCase { assertEquals("unknown", result.getInName()); assertEquals("UNKNOWN", result.name()); assertEquals("UNKNOWN", result.toString()); - assertEquals(1, result.ordinal()); + assertEquals(2, result.ordinal()); } /** diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/DomainInfoTest.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/DomainInfoTest.java index b49469ae42..08b375ae7a 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/DomainInfoTest.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/DomainInfoTest.java @@ -135,7 +135,7 @@ public class DomainInfoTest extends TestCase { String result = fixture.toString(); - assertEquals("[DomainInfo([TraceInfo(Name=domain)],Channels=None)]", result); + assertEquals("[DomainInfo([TraceInfo(Name=domain)],Channels=None,isKernel=false)]", result); } /** @@ -145,7 +145,7 @@ public class DomainInfoTest extends TestCase { public void testToString_2() { String result = fDomainInfo1.toString(); - assertEquals("[DomainInfo([TraceInfo(Name=test1)],Channels=[ChannelInfo([TraceInfo(Name=channel1)],State=DISABLED,OverwriteMode=true,SubBuffersSize=13,NumberOfSubBuffers=12,SwitchTimer=10,ReadTimer=11,output=splice(),Events=[EventInfo([BaseEventInfo([TraceInfo(Name=event1)],type=TRACEPOINT,level=TRACE_DEBUG)],State=ENABLED)])])]", result); + assertEquals("[DomainInfo([TraceInfo(Name=test1)],Channels=[ChannelInfo([TraceInfo(Name=channel1)],State=DISABLED,OverwriteMode=true,SubBuffersSize=13,NumberOfSubBuffers=12,SwitchTimer=10,ReadTimer=11,output=splice(),Events=[EventInfo([BaseEventInfo([TraceInfo(Name=event1)],type=TRACEPOINT,level=TRACE_DEBUG)],State=ENABLED)])],isKernel=false)]", result); } // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/EventInfoTest.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/EventInfoTest.java index 34746833cf..307aafd9b7 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/EventInfoTest.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/EventInfoTest.java @@ -75,7 +75,7 @@ public class EventInfoTest extends TestCase { assertEquals("unknown", result.getInName()); assertEquals("UNKNOWN", result.name()); assertEquals("UNKNOWN", result.toString()); - assertEquals(1, result.ordinal()); + assertEquals(2, result.ordinal()); TraceEnablement state = fixture.getState(); assertEquals("disabled", state.getInName()); @@ -131,7 +131,7 @@ public class EventInfoTest extends TestCase { assertEquals("unknown", result.getInName()); assertEquals("UNKNOWN", result.name()); assertEquals("UNKNOWN", result.toString()); - assertEquals(1, result.ordinal()); + assertEquals(2, result.ordinal()); // setEventType(String typeName) String typeName = ""; @@ -141,7 +141,7 @@ public class EventInfoTest extends TestCase { assertEquals("unknown", result.getInName()); assertEquals("UNKNOWN", result.name()); assertEquals("UNKNOWN", result.toString()); - assertEquals(1, result.ordinal()); + assertEquals(2, result.ordinal()); typeName = "unknown"; @@ -151,7 +151,7 @@ public class EventInfoTest extends TestCase { assertEquals("unknown", result.getInName()); assertEquals("UNKNOWN", result.name()); assertEquals("UNKNOWN", result.toString()); - assertEquals(1, result.ordinal()); + assertEquals(2, result.ordinal()); // setState(String stateName) fixture.setState("disabled"); diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/SessionInfoTest.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/SessionInfoTest.java index 6f4563645d..2fa301a2c5 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/SessionInfoTest.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/SessionInfoTest.java @@ -198,7 +198,7 @@ public class SessionInfoTest extends TestCase { String result = fSessionInfo1.toString(); // add additional test code here - assertEquals("[SessionInfo([TraceInfo(Name=session1)],State=ACTIVE,Domains=[DomainInfo([TraceInfo(Name=test1)],Channels=[ChannelInfo([TraceInfo(Name=channel1)],State=DISABLED,OverwriteMode=true,SubBuffersSize=13,NumberOfSubBuffers=12,SwitchTimer=10,ReadTimer=11,output=splice(),Events=[EventInfo([BaseEventInfo([TraceInfo(Name=event1)],type=TRACEPOINT,level=TRACE_DEBUG)],State=ENABLED)])])])]", result); + assertEquals("[SessionInfo([TraceInfo(Name=session1)],State=ACTIVE,Domains=[DomainInfo([TraceInfo(Name=test1)],Channels=[ChannelInfo([TraceInfo(Name=channel1)],State=DISABLED,OverwriteMode=true,SubBuffersSize=13,NumberOfSubBuffers=12,SwitchTimer=10,ReadTimer=11,output=splice(),Events=[EventInfo([BaseEventInfo([TraceInfo(Name=event1)],type=TRACEPOINT,level=TRACE_DEBUG)],State=ENABLED)])],isKernel=false)])]", result); } // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/LTTngControlServiceTest.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/LTTngControlServiceTest.java index 779c272287..e4b979a42d 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/LTTngControlServiceTest.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/LTTngControlServiceTest.java @@ -413,9 +413,9 @@ public class LTTngControlServiceTest extends TestCase { } } - void testDestroySession() { + public void testDestroySession() { try { - ILttngControlService service = new LTTngControlService(fShellFactory.getShellForSessionErrors()); + ILttngControlService service = new LTTngControlService(fShellFactory.getShellForSessionNames()); service.destroySession("mysession2", new NullProgressMonitor()); } catch (ExecutionException e) { fail(e.toString()); diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/NoSessionNamesShell.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/NoSessionNamesShell.java index de933f0ad8..1a4b483b5b 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/NoSessionNamesShell.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/NoSessionNamesShell.java @@ -11,7 +11,7 @@ public class NoSessionNamesShell extends TestCommandShell { @Override public ICommandResult executeCommand(String command, IProgressMonitor monitor, boolean checkReturnValue) throws ExecutionException { String[] output = new String[1]; - output[0] = String.valueOf("Error: No Session found"); - return new CommandResult(1, output); + output[0] = String.valueOf("Currently no available tracing session"); + return new CommandResult(0, output); } } -- 2.34.1