From: Geneviève Bastien Date: Wed, 29 Jan 2014 20:08:28 +0000 (-0500) Subject: TMF: Renamed o.e.l.tmf.analysis.xml.core.tests stubs folder to common X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=45b2be646a5db2eeaca78acb4672c4bc105fbb0d;p=deliverable%2Ftracecompass.git TMF: Renamed o.e.l.tmf.analysis.xml.core.tests stubs folder to common As mentioned as a last comment in the https://git.eclipse.org/r/#/c/19914/ patch, this folder contains test traces and not implementation stubs so the name is more fit as "common". Change-Id: Ia274cb4de2086a0311ffea4a1b95f6407d584b77 Signed-off-by: Geneviève Bastien Reviewed-on: https://git.eclipse.org/r/21294 Tested-by: Hudson CI Reviewed-by: Matthew Khouzam IP-Clean: Matthew Khouzam --- diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/.classpath b/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/.classpath index f1d3296b72..64f94945a3 100644 --- a/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/.classpath +++ b/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/.classpath @@ -3,6 +3,6 @@ - + diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/build.properties b/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/build.properties index 73ce20d487..a4d88ed3c7 100644 --- a/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/build.properties +++ b/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/build.properties @@ -1,5 +1,5 @@ source.. = src/,\ - stubs/ + common/ output.. = bin/ bin.includes = META-INF/,\ .,\ diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/common/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java b/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/common/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java new file mode 100644 index 0000000000..2274bd80f0 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/common/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2014 École Polytechnique de Montréal + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Geneviève Bastien - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.linuxtools.tmf.analysis.xml.core.tests.common; + +import java.io.File; + +/** + * Provides some test XML files to use + * + * @author Geneviève Bastien + */ +public enum TmfXmlTestFiles { + /** A valid XML test file */ + VALID_FILE("../org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_valid.xml"), + /** An invalid test file */ + INVALID_FILE("../org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid.xml"); + + private final String fPath; + + private TmfXmlTestFiles(String file) { + fPath = file; + } + + /** + * Get the file name part of the file + * + * @return The path of this test file + */ + public String getPath() { + return fPath; + } + + /** + * Returns the file object corresponding to the test XML file + * + * @return The file object for this test file + */ + public File getFile() { + return new File(fPath); + } + +} diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/stubs/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java b/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/stubs/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java deleted file mode 100644 index 2274bd80f0..0000000000 --- a/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/stubs/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 École Polytechnique de Montréal - * - * All rights reserved. This program and the accompanying materials are - * made available under the terms of the Eclipse Public License v1.0 which - * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Geneviève Bastien - Initial API and implementation - *******************************************************************************/ - -package org.eclipse.linuxtools.tmf.analysis.xml.core.tests.common; - -import java.io.File; - -/** - * Provides some test XML files to use - * - * @author Geneviève Bastien - */ -public enum TmfXmlTestFiles { - /** A valid XML test file */ - VALID_FILE("../org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_valid.xml"), - /** An invalid test file */ - INVALID_FILE("../org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid.xml"); - - private final String fPath; - - private TmfXmlTestFiles(String file) { - fPath = file; - } - - /** - * Get the file name part of the file - * - * @return The path of this test file - */ - public String getPath() { - return fPath; - } - - /** - * Returns the file object corresponding to the test XML file - * - * @return The file object for this test file - */ - public File getFile() { - return new File(fPath); - } - -}