From 3decf1fe32224a3e4aed8479117f3dc70fc0dc10 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 22 Aug 2012 16:23:06 -0700 Subject: [PATCH] Cosmetics. --- .../cdt/internal/pdom/tests/PDOMLocationTests.java | 8 ++++---- .../cdt/internal/pdom/tests/PDOMProviderTests.java | 10 +++++----- .../eclipse/cdt/internal/pdom/tests/PDOMTests.java | 13 +++++-------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMLocationTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMLocationTests.java index fd3d21f10ee..2f61446fb3f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMLocationTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMLocationTests.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Andrew Ferguson (Symbian) - Initial implementation + * Andrew Ferguson (Symbian) - Initial implementation *******************************************************************************/ package org.eclipse.cdt.internal.pdom.tests; @@ -39,7 +39,7 @@ public class PDOMLocationTests extends BaseTestCase { @Override protected void setUp() throws Exception { - cproject= CProjectHelper.createCCProject("PDOMLocationTests"+System.currentTimeMillis(), "bin", IPDOMManager.ID_NO_INDEXER); + cproject= CProjectHelper.createCCProject("PDOMLocationTests" + System.currentTimeMillis(), "bin", IPDOMManager.ID_NO_INDEXER); super.setUp(); } @@ -66,11 +66,11 @@ public class PDOMLocationTests extends BaseTestCase { Set externals= new HashSet(); externals.addAll(Arrays.asList(linuxExternals)); - if(Platform.getOS().equals("win32")) { + if (Platform.getOS().equals("win32")) { externals.addAll(Arrays.asList(winExternals)); } - for(String ext : externals) { + for (String ext : externals) { IIndexFileLocation loc = IndexLocationFactory.getExternalIFL(ext); String raw = converter.toInternalFormat(loc); IIndexFileLocation roundtrip = converter.fromInternalFormat(raw); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java index cc5047d5bac..f5a8ce9598b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java @@ -55,7 +55,7 @@ public class PDOMProviderTests extends PDOMTestBase { final File tempPDOM= File.createTempFile("foo", "bar"); { - ICProject cproject= CProjectHelper.createCCProject("foo"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); + ICProject cproject= CProjectHelper.createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n"); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm()); @@ -76,7 +76,7 @@ public class PDOMProviderTests extends PDOMTestBase { } final URI baseURI= new File("c:/ExternalSDK/").toURI(); - final ICProject cproject2= CProjectHelper.createCCProject("bar"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); + final ICProject cproject2= CProjectHelper.createCCProject("bar" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n"); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm()); @@ -127,7 +127,7 @@ public class PDOMProviderTests extends PDOMTestBase { final File tempPDOM= File.createTempFile("foo", "bar"); { - ICProject cproject= CProjectHelper.createCCProject("foo"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); + ICProject cproject= CProjectHelper.createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n"); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm()); @@ -147,12 +147,12 @@ public class PDOMProviderTests extends PDOMTestBase { CProjectHelper.delete(cproject); } - final ICProject cproject3= CProjectHelper.createCCProject("bar"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); + final ICProject cproject3= CProjectHelper.createCCProject("bar" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); TestSourceReader.createFile(cproject3.getProject(), new Path("/source.cpp"), "namespace Y { class A {}; }\n\n"); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm()); final URI baseURI= new File("c:/ExternalSDK/").toURI(); - final ICProject cproject2= CProjectHelper.createCCProject("baz"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); + final ICProject cproject2= CProjectHelper.createCCProject("baz" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n"); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm()); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java index fd92b1d2965..f244ec3925c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java @@ -18,14 +18,12 @@ import junit.framework.TestSuite; /** * @author Doug Schaefer - * */ public class PDOMTests extends TestSuite { public static Test suite() { TestSuite suite = new PDOMTests(); - - + suite.addTest(DBTest.suite()); suite.addTest(DBPropertiesTests.suite()); suite.addTest(PDOMCBugsTest.suite()); @@ -42,7 +40,7 @@ public class PDOMTests extends TestSuite { suite.addTest(BTreeTests.suite()); suite.addTest(FilesOnReindexTests.suite()); suite.addTest(GeneratePDOMApplicationTest.suite()); - + suite.addTest(CPPFieldTests.suite()); suite.addTest(CPPFunctionTests.suite()); suite.addTest(CPPVariableTests.suite()); @@ -50,16 +48,15 @@ public class PDOMTests extends TestSuite { suite.addTest(CPPFunctionTemplateTests.suite()); suite.addTest(MethodTests.suite()); suite.addTest(NamespaceTests.suite()); - + suite.addTest(CFunctionTests.suite()); suite.addTest(CVariableTests.suite()); suite.addTest(CCompositeTypeTests.suite()); - + suite.addTest(DefDeclTests.suite()); suite.addTest(RaceCondition157992Test.suite()); suite.addTest(ChangeConfigurationTests.suite()); - + return suite; } - }