projects
/
deliverable
/
tracecompass.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ctf: remove some null warnings in TmfTraceManagerTest
[deliverable/tracecompass.git]
/
ctf
/
org.eclipse.tracecompass.tmf.ctf.core.tests
/
src
/
org
/
eclipse
/
tracecompass
/
tmf
/
ctf
/
core
/
tests
/
temp
/
tracemanager
/
TmfTraceManagerTest.java
diff --git
a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java
b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java
index c534e5a85be6caa4213e6cc12254ae01697b80a6..df5999f78161892aa6ebfc9efc3b924deefe0a2c 100644
(file)
--- a/
ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java
+++ b/
ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java
@@
-193,11
+193,15
@@
public class TmfTraceManagerTest {
*/
@Test
public void testTraceSetExperiment() {
*/
@Test
public void testTraceSetExperiment() {
- TmfExperiment exp = createExperiment(trace1, trace2);
- openTrace(trace1);
+ final ITmfTrace localTrace1 = trace1;
+ final ITmfTrace localTrace2 = trace2;
+ assertNotNull(localTrace1);
+ assertNotNull(localTrace2);
+ TmfExperiment exp = createExperiment(localTrace1, localTrace2);
+ openTrace(localTrace1);
openTrace(exp);
openTrace(exp);
- Collection<ITmfTrace> expected = ImmutableSet.of(
trace1, t
race2);
+ Collection<ITmfTrace> expected = ImmutableSet.of(
localTrace1, localT
race2);
Collection<ITmfTrace> actual = tm.getActiveTraceSet();
assertEquals(2, actual.size());
Collection<ITmfTrace> actual = tm.getActiveTraceSet();
assertEquals(2, actual.size());
@@
-209,15
+213,20
@@
public class TmfTraceManagerTest {
*/
@Test
public void testTraceSetWithExperiment() {
*/
@Test
public void testTraceSetWithExperiment() {
+ final ITmfTrace localTrace1 = trace1;
+ final ITmfTrace localTrace2 = trace2;
+ assertNotNull(localTrace1);
+ assertNotNull(localTrace2);
/* Test with a trace */
/* Test with a trace */
- Collection<ITmfTrace> expected = Collections.singleton(
t
race1);
- Collection<ITmfTrace> actual = TmfTraceManager.getTraceSetWithExperiment(
t
race1);
+ Collection<ITmfTrace> expected = Collections.singleton(
localT
race1);
+ Collection<ITmfTrace> actual = TmfTraceManager.getTraceSetWithExperiment(
localT
race1);
assertEquals(1, actual.size());
assertEquals(expected, actual);
/* Test with an experiment */
assertEquals(1, actual.size());
assertEquals(expected, actual);
/* Test with an experiment */
- TmfExperiment exp = createExperiment(trace1, trace2);
- expected = ImmutableSet.of(trace1, trace2, exp);
+ TmfExperiment exp = createExperiment(localTrace1, localTrace2);
+ assertNotNull(exp);
+ expected = ImmutableSet.of(localTrace1, localTrace2, exp);
actual = TmfTraceManager.getTraceSetWithExperiment(exp);
assertEquals(3, actual.size());
assertEquals(expected, actual);
actual = TmfTraceManager.getTraceSetWithExperiment(exp);
assertEquals(3, actual.size());
assertEquals(expected, actual);
@@
-228,15
+237,19
@@
public class TmfTraceManagerTest {
*/
@Test
public void testSupplementaryFileDir() {
*/
@Test
public void testSupplementaryFileDir() {
- String name1 = trace1.getName();
- String name2 = trace2.getName();
+ final ITmfTrace localTrace1 = trace1;
+ final ITmfTrace localTrace2 = trace2;
+ assertNotNull(localTrace1);
+ assertNotNull(localTrace2);
+ String name1 = localTrace1.getName();
+ String name2 = localTrace2.getName();
String basePath = TmfTraceManager.getTemporaryDirPath() + File.separator;
String expected1 = basePath + name1 + File.separator;
String expected2 = basePath + name2 + File.separator;
String basePath = TmfTraceManager.getTemporaryDirPath() + File.separator;
String expected1 = basePath + name1 + File.separator;
String expected2 = basePath + name2 + File.separator;
- assertEquals(expected1, TmfTraceManager.getSupplementaryFileDir(
t
race1));
- assertEquals(expected2, TmfTraceManager.getSupplementaryFileDir(
t
race2));
+ assertEquals(expected1, TmfTraceManager.getSupplementaryFileDir(
localT
race1));
+ assertEquals(expected2, TmfTraceManager.getSupplementaryFileDir(
localT
race2));
}
// ------------------------------------------------------------------------
}
// ------------------------------------------------------------------------
This page took
0.026806 seconds
and
5
git commands to generate.