mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2013-07-17 17:46:24 -07:00
parent 30e8158c26
commit 8e7c7a7517
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java
View file

@ -10,7 +10,6 @@
* Anton Leherbauer (Wind River Systems) * Anton Leherbauer (Wind River Systems)
* James Blackburn (Broadcom Corp.) * James Blackburn (Broadcom Corp.)
***********************************************************************/ ***********************************************************************/
package org.eclipse.cdt.core.cdescriptor.tests; package org.eclipse.cdt.core.cdescriptor.tests;
import java.io.IOException; import java.io.IOException;
@ -20,7 +19,6 @@ import java.io.Reader;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import junit.extensions.TestSetup; import junit.extensions.TestSetup;
import junit.framework.Assert;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
@ -46,9 +44,9 @@ import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.junit.Assert;
public class CDescriptorTests extends BaseTestCase { public class CDescriptorTests extends BaseTestCase {
static String projectId = CTestPlugin.PLUGIN_ID + ".TestProject"; static String projectId = CTestPlugin.PLUGIN_ID + ".TestProject";
static IProject fProject; static IProject fProject;
static CDescriptorListener listener = new CDescriptorListener(); static CDescriptorListener listener = new CDescriptorListener();
@ -67,12 +65,12 @@ public class CDescriptorTests extends BaseTestCase {
TestSuite suite = new TestSuite(CDescriptorTests.class.getName()); TestSuite suite = new TestSuite(CDescriptorTests.class.getName());
// Add all the tests in this class // Add all the tests in this class
for (Method m : CDescriptorTests.class.getMethods()) for (Method m : CDescriptorTests.class.getMethods()) {
if (m.getName().startsWith("test")) if (m.getName().startsWith("test"))
suite.addTest(new CDescriptorTests(m.getName())); suite.addTest(new CDescriptorTests(m.getName()));
}
TestSetup wrapper = new TestSetup(suite) { TestSetup wrapper = new TestSetup(suite) {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
oneTimeSetUp(); oneTimeSetUp();
@ -82,7 +80,6 @@ public class CDescriptorTests extends BaseTestCase {
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
oneTimeTearDown(); oneTimeTearDown();
} }
}; };
return wrapper; return wrapper;
} }
@ -107,7 +104,6 @@ public class CDescriptorTests extends BaseTestCase {
} }
static public class CDescriptorListener implements ICDescriptorListener { static public class CDescriptorListener implements ICDescriptorListener {
@Override @Override
public void descriptorChanged(CDescriptorEvent event) { public void descriptorChanged(CDescriptorEvent event) {
fLastEvent = event; fLastEvent = event;
@ -116,7 +112,6 @@ public class CDescriptorTests extends BaseTestCase {
static void oneTimeSetUp() throws Exception { static void oneTimeSetUp() throws Exception {
CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override @Override
public void run(IProgressMonitor monitor) throws CoreException { public void run(IProgressMonitor monitor) throws CoreException {
IWorkspaceRoot root = CTestPlugin.getWorkspace().getRoot(); IWorkspaceRoot root = CTestPlugin.getWorkspace().getRoot();
@ -144,7 +139,6 @@ public class CDescriptorTests extends BaseTestCase {
public void testDescriptorCreation() throws Exception { public void testDescriptorCreation() throws Exception {
CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@Override @Override
public void run(IProgressMonitor monitor) throws CoreException { public void run(IProgressMonitor monitor) throws CoreException {
CCorePlugin.getDefault().mapCProjectOwner(fProject, projectId, false); CCorePlugin.getDefault().mapCProjectOwner(fProject, projectId, false);
@ -210,7 +204,7 @@ public class CDescriptorTests extends BaseTestCase {
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=196118 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=196118
public void testConcurrentDescriptorModification() throws Exception { public void testConcurrentDescriptorModification() throws Exception {
int lastLength = 0; int lastLength = 0;
for (int i=0; i<100; ++i) { for (int i= 0; i < 100; ++i) {
final int indexi = i; final int indexi = i;
PDOMManager pdomMgr= (PDOMManager)CCorePlugin.getIndexManager(); PDOMManager pdomMgr= (PDOMManager)CCorePlugin.getIndexManager();
pdomMgr.shutdown(); pdomMgr.shutdown();
@ -268,11 +262,11 @@ public class CDescriptorTests extends BaseTestCase {
} }
/* /*
* This test should pass as two threads, operating on the * This test should pass as two threads, operating on the different storage elements
* different storage elements (outside of an operation) should be safe * (outside of an operation) should be safe.
*/ */
public void testConcurrentDifferentStorageElementModification() throws Exception { public void testConcurrentDifferentStorageElementModification() throws Exception {
for (int i=0; i < 100; ++i) { for (int i= 0; i < 100; ++i) {
Thread t= new Thread() { Thread t= new Thread() {
@Override @Override
public void run() { public void run() {
@ -304,11 +298,10 @@ public class CDescriptorTests extends BaseTestCase {
} }
/* /*
* Test that (non-structural) changes to the storage element tree * Tests that (non-structural) changes to the storage element tree work as expected.
* work as expected.
*/ */
public void testConcurrentSameStorageElementModification() throws Exception { public void testConcurrentSameStorageElementModification() throws Exception {
for (int i=0; i < 100; ++i) { for (int i= 0; i < 100; ++i) {
Thread t= new Thread() { Thread t= new Thread() {
@Override @Override
public void run() { public void run() {
@ -342,7 +335,7 @@ public class CDescriptorTests extends BaseTestCase {
* Tests deadlock when accessing c project description concurrently from two threads * Tests deadlock when accessing c project description concurrently from two threads
*/ */
public void testDeadlockDuringProjectCreation() throws Exception { public void testDeadlockDuringProjectCreation() throws Exception {
for (int i=0; i < 10; ++i) { for (int i= 0; i < 10; ++i) {
oneTimeTearDown(); oneTimeTearDown();
oneTimeSetUp(); oneTimeSetUp();
Thread t= new Thread() { Thread t= new Thread() {
@ -373,7 +366,6 @@ public class CDescriptorTests extends BaseTestCase {
} }
public void testDescriptorConversion() { public void testDescriptorConversion() {
} }
public void testExtensionCreation() throws Exception { public void testExtensionCreation() throws Exception {
@ -424,7 +416,6 @@ public class CDescriptorTests extends BaseTestCase {
Assert.assertEquals(fLastEvent.getType(), CDescriptorEvent.CDTPROJECT_CHANGED); Assert.assertEquals(fLastEvent.getType(), CDescriptorEvent.CDTPROJECT_CHANGED);
Assert.assertEquals(fLastEvent.getFlags(), CDescriptorEvent.EXTENSION_CHANGED); Assert.assertEquals(fLastEvent.getFlags(), CDescriptorEvent.EXTENSION_CHANGED);
fLastEvent = null; fLastEvent = null;
} }
public void testProjectDataCreate() throws Exception { public void testProjectDataCreate() throws Exception {