X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=org.eclipse.linuxtools.tmf.ui.tests%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Ftmf%2Fui%2Ftests%2Ftrace%2FCustomTxtIndexTest.java;h=ef2910881793deb6be033b2458eddf4b35bc7ee0;hb=fbdee51bae97d04fb50bec47da228e74672154ca;hp=98765209bea6813c870d2f2974acc962defa7f97;hpb=46965b5eb18197cf2c3374f9e26c546e4b4f7b90;p=deliverable%2Ftracecompass.git diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java index 98765209be..ef29108817 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2013 Ericsson + * Copyright (c) 2009, 2014 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -21,9 +21,10 @@ import java.io.FileWriter; import java.text.SimpleDateFormat; import java.util.Date; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; +import org.eclipse.linuxtools.tmf.core.trace.TmfTraceManager; import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; /** @@ -33,7 +34,7 @@ import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; */ public class CustomTxtIndexTest extends AbstractCustomTraceIndexTest { - private static final String TRACE_DIRECTORY = System.getProperty("java.io.tmpdir") + File.separator + "dummyTxtTrace"; + private static final String TRACE_DIRECTORY = TmfTraceManager.getTemporaryDirPath() + File.separator + "dummyTxtTrace"; private static final String TRACE_PATH = TRACE_DIRECTORY + File.separator + "test.txt"; private static final String DEFINITION_PATH = "tracesets" + File.separator + "txt" + File.separator + "testTxtDefinition.xml"; @@ -51,13 +52,13 @@ public class CustomTxtIndexTest extends AbstractCustomTraceIndexTest { protected TestTrace createTrace() throws Exception { CustomTxtTraceDefinition definition = createDefinition(); final File file = new File(TRACE_PATH); - BufferedWriter writer = new BufferedWriter(new FileWriter(file)); - for (int i = 0; i < NB_EVENTS; ++i) { - SimpleDateFormat f = new SimpleDateFormat(TIMESTAMP_FORMAT); - String eventStr = f.format(new Date(i)) + " hello world\n"; - writer.write(eventStr); + try (BufferedWriter writer = new BufferedWriter(new FileWriter(file));) { + for (int i = 0; i < NB_EVENTS; ++i) { + SimpleDateFormat f = new SimpleDateFormat(TIMESTAMP_FORMAT); + String eventStr = f.format(new Date(i)) + " hello world\n"; + writer.write(eventStr); + } } - writer.close(); return new TestTxtTrace(file.toString(), definition, BLOCK_SIZE); }