From a797f98218537c45236e9eb817634ae582ad72ed Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 19 Mar 2012 20:29:28 -0700 Subject: [PATCH] Added file name validation. --- .../cdt/ui/tests/refactoring/RefactoringTestBase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestBase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestBase.java index 6963b4af42b..9741fc6801e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestBase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestBase.java @@ -101,9 +101,11 @@ public abstract class RefactoringTestBase extends BaseTestCase { BufferedReader reader = new BufferedReader(new StringReader(contents.toString())); String line; while ((line = reader.readLine()) != null) { + String trimmedLine = line.trim(); if (testFile == null) { - testFile = new TestSourceFile(line.trim()); - } else if (isResultDelimiter(line.trim())) { + assertTrue("Invalid file name \"" + trimmedLine + "\"", trimmedLine.matches("^(\\w+/)*\\w+\\.\\w+$")); + testFile = new TestSourceFile(trimmedLine); + } else if (isResultDelimiter(trimmedLine)) { expectedResult = true; } else if (expectedResult) { testFile.addLineToExpectedSource(line);