diff options
author | Marc-Andre Laperle | 2013-11-18 01:44:39 +0000 |
---|---|---|
committer | Marc-Andre Laperle | 2013-11-26 19:43:06 +0000 |
commit | f61578e055c4f89433a366bdbed722bc80dae872 (patch) | |
tree | d020cf01851beab29cbce68671a8b49e68008fcf | |
parent | 17fce861815b45b0833d6eecfc7a5722f0b474aa (diff) | |
download | org.eclipse.linuxtools-f61578e055c4f89433a366bdbed722bc80dae872.tar.gz org.eclipse.linuxtools-f61578e055c4f89433a366bdbed722bc80dae872.tar.xz org.eclipse.linuxtools-f61578e055c4f89433a366bdbed722bc80dae872.zip |
tmf: Fix core tests failing on Windows
2 tests did not dispose the index correctly. Solution: make sure
fCheckpointCollection gets assigned when recreating the collection so
that it gets disposed in the tearDown.
Change-Id: I6a79b62cdabf136790bcf76ca606e71c31cdd81b
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/18481
Tested-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
IP-Clean: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
3 files changed, 3 insertions, 3 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/BTreeTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/BTreeTest.java index d3cbc86316..2c2c975b84 100644 --- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/BTreeTest.java +++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/BTreeTest.java @@ -38,7 +38,7 @@ public class BTreeTest extends AbstractCheckpointCollectionTest { @Override protected BTree createCollection() { - fBTree = new BTree(DEGREE, getFile(), (ITmfPersistentlyIndexable) getTrace()); + fCheckpointCollection = fBTree = new BTree(DEGREE, getFile(), (ITmfPersistentlyIndexable) getTrace()); return fBTree; } diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/FlatArrayTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/FlatArrayTest.java index 539d75bb98..583c2d98ad 100644 --- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/FlatArrayTest.java +++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/FlatArrayTest.java @@ -35,7 +35,7 @@ public class FlatArrayTest extends AbstractCheckpointCollectionTest { @Override protected FlatArray createCollection() { - fFlatArray = new FlatArray(getFile(), (ITmfPersistentlyIndexable) getTrace()); + fCheckpointCollection = fFlatArray = new FlatArray(getFile(), (ITmfPersistentlyIndexable) getTrace()); return fFlatArray; } diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/TmfMemoryIndexTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/TmfMemoryIndexTest.java index 40d35621aa..33ebec31c4 100644 --- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/TmfMemoryIndexTest.java +++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/TmfMemoryIndexTest.java @@ -33,7 +33,7 @@ public class TmfMemoryIndexTest extends AbstractCheckpointCollectionTest { @Override protected TmfMemoryIndex createCollection() { - fMemoryIndex = new TmfMemoryIndex(getTrace()); + fCheckpointCollection = fMemoryIndex = new TmfMemoryIndex(getTrace()); return fMemoryIndex; } |