From 0716864d276c01d3daa8476eb865963c6ad0d5d9 Mon Sep 17 00:00:00 2001 From: Peter Graves Date: Fri, 27 Sep 2002 13:46:54 +0000 Subject: [PATCH] Changed all QNX pr numbers to bugzilla pr numbers. General code cleanup (removed unused imports/variables, etc) --- .../cdt/core/model/tests/AllCoreTests.java | 2 -- .../cdt/core/model/tests/ArchiveTests.java | 10 ++----- .../cdt/core/model/tests/BinaryTests.java | 17 ++++------- .../cdt/core/model/tests/CModelTests.java | 4 --- .../cdt/core/model/tests/FlagTests.java | 3 -- .../model/tests/TranslationUnitTests.java | 28 ++++++------------- .../cdt/testplugin/CProjectHelper.java | 16 ----------- .../eclipse/cdt/testplugin/CTestSetup.java | 1 - .../org/eclipse/cdt/testplugin/NewMain.java | 1 - .../cdt/testplugin/test/HelloWorld.java | 1 - .../cdt/testplugin/util/ExpectedStrings.java | 1 - .../cdt/ui/tests/dialogs/PreferencesTest.java | 3 -- 12 files changed, 16 insertions(+), 71 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java index 962e93ad87c..eddf8c0493d 100644 --- a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java +++ b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/AllCoreTests.java @@ -4,8 +4,6 @@ package org.eclipse.cdt.core.model.tests; * All Rights Reserved. */ -import org.eclipse.cdt.internal.core.model.TranslationUnit; -import org.eclipse.cdt.testplugin.util.*; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java index 1bd4e9be66f..3cf0dbe7e8e 100644 --- a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java +++ b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java @@ -6,7 +6,6 @@ package org.eclipse.cdt.core.model.tests; */ -import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -15,12 +14,8 @@ import junit.framework.TestSuite; import org.eclipse.cdt.testplugin.*; import org.eclipse.cdt.testplugin.util.*; import org.eclipse.cdt.core.model.*; -import org.eclipse.core.internal.runtime.Log; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.internal.core.model.*; @@ -144,7 +139,7 @@ public class ArchiveTests extends TestCase { */ public void testArchive() throws CoreException { - Archive myArchive; + Archive myArchive; boolean caught; myArchive=null; @@ -154,7 +149,7 @@ public class ArchiveTests extends TestCase { } catch (IllegalArgumentException e) { caught=true; } - assertTrue("PR:12037 Created an archive with a C file", caught); + assertTrue("PR:23601 Created an archive with a C file", caught); myArchive=null; caught=false; try { @@ -244,7 +239,6 @@ public class ArchiveTests extends TestCase { ExpectedStrings expBin, expObj[]; String[] myStrings; int x; - IArchive[] myArchives; /**** diff --git a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java index dd4a8c15145..611e17aa784 100644 --- a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java +++ b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java @@ -6,7 +6,6 @@ package org.eclipse.cdt.core.model.tests; */ -import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -15,12 +14,8 @@ import junit.framework.TestSuite; import org.eclipse.cdt.testplugin.*; import org.eclipse.cdt.testplugin.util.*; import org.eclipse.cdt.core.model.*; -import org.eclipse.core.internal.runtime.Log; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.internal.core.model.*; @@ -188,7 +183,7 @@ public class BinaryTests extends TestCase { * getting their archives from the project, not creating them themselves */ public void testBinary() throws CoreException { - Binary myBinary; + Binary myBinary; boolean caught; myBinary=null; @@ -198,7 +193,7 @@ public class BinaryTests extends TestCase { } catch (IllegalArgumentException e) { caught=true; } - assertTrue("PR:13037 Created an Binary with a C file", caught); + assertTrue("PR:23601 Created an Binary with a C file", caught); myBinary=null; caught=false; try { @@ -331,12 +326,12 @@ public class BinaryTests extends TestCase { * Since there is no comment on this function, I have no idea what * it is ment to do. Once I find out what it's ment to do, I will * actually write some tests. - * PR13052 + * PR23602 */ assertTrue("Expected 76 Got: " + bigBinary.getData(), bigBinary.getData()==76); assertTrue("Expected 8, Got: " + littleBinary.getData(), littleBinary.getData()==8); } else - fail("PR:13052 No docs, can't test"); + fail("PR:23602 No docs, can't test"); } /*** @@ -423,13 +418,13 @@ public class BinaryTests extends TestCase { * Since there is no comment on this function, I have no idea what * it is ment to do. Once I find out what it's ment to do, I will * actually write some tests. - * PR13052 + * PR23602 */ assertTrue("Expected 296, Got: " + bigBinary.getText(), bigBinary.getText()==296); assertTrue("Expected 296, Got: " + littleBinary.getText(), littleBinary.getText()==296); } else - fail("PR:13052 No docs, can't test"); + fail("PR:23602 No docs, can't test"); } /*** diff --git a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java index f4585523272..0012667b993 100644 --- a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java +++ b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java @@ -15,9 +15,6 @@ import org.eclipse.cdt.testplugin.*; import org.eclipse.cdt.core.model.*; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CProjectNature; /** @@ -146,7 +143,6 @@ public class CModelTests extends TestCase { */ public void testFileType() throws CoreException,FileNotFoundException { ICProject testProject; - ICFile myfile; testProject=CProjectHelper.createCProject("filetest", "none"); if (testProject==null) fail("Unable to create project"); diff --git a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java index 946cfd4e98f..f640aec9541 100644 --- a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java +++ b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java @@ -9,12 +9,9 @@ package org.eclipse.cdt.core.model.tests; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.cdt.testplugin.*; import org.eclipse.cdt.core.model.*; import org.eclipse.cdt.internal.core.model.*; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; /** * @author Peter Graves * diff --git a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java index 27cb0e1f386..13c8afbd2e4 100644 --- a/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java +++ b/core/org.eclipse.cdt.ui.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitTests.java @@ -6,14 +6,9 @@ package org.eclipse.cdt.core.model.tests; */ -import java.io.BufferedInputStream; -import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.util.Stack; import junit.framework.TestCase; @@ -21,12 +16,8 @@ import junit.framework.TestSuite; import org.eclipse.cdt.testplugin.*; import org.eclipse.cdt.testplugin.util.*; import org.eclipse.cdt.core.model.*; -import org.eclipse.core.internal.runtime.Log; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CProjectNature; import org.eclipse.cdt.internal.core.model.*; @@ -196,7 +187,7 @@ public class TranslationUnitTests extends TestCase { } catch (IllegalArgumentException e) { caught=true; } - assertTrue("PR:13037 Created an TranslationUnit with a .o file", caught); + assertTrue("PR:23601 Created an TranslationUnit with a .o file", caught); myTranslationUnit=null; caught=false; try { @@ -293,7 +284,7 @@ public class TranslationUnitTests extends TestCase { expectedString.foundString(elements[x].getElementName()); } } - assertTrue("PR:13062 " +expectedString.getMissingString(),expectedString.gotAll()); + assertTrue("PR:23603 " +expectedString.getMissingString(),expectedString.gotAll()); assertTrue(expectedString.getExtraString(),!expectedString.gotExtra()); } @@ -319,7 +310,7 @@ public class TranslationUnitTests extends TestCase { } if (!missing.empty()) { - String output=new String("PR: 13062 Could not get elements: "); + String output=new String("PR:23603 Could not get elements: "); while (!missing.empty()) output+=missing.pop() + " "; assertTrue(output, false); @@ -342,7 +333,7 @@ public class TranslationUnitTests extends TestCase { missing.push(expectedStringList[x]); else { if (expectedStringList[x].equals("mystruct_t")) { - assertTrue("PR: 13062 expected:" + expectedStringList[x] + " Got:" + myElement.getElementName(), + assertTrue("PR:23603 expected:" + expectedStringList[x] + " Got:" + myElement.getElementName(), expectedStringList[x].equals(myElement.getElementName())); } else { assertTrue("Expected:" + expectedStringList[x] + " Got:" + myElement.getElementName(), @@ -353,7 +344,7 @@ public class TranslationUnitTests extends TestCase { } if (!missing.empty()) { - String output=new String("PR: 13062 Could not get elements: "); + String output=new String("PR: 23603 Could not get elements: "); while (!missing.empty()) output+=missing.pop() + " "; assertTrue(output, false); @@ -374,7 +365,7 @@ public class TranslationUnitTests extends TestCase { if (myInclude==null) fail("Unable to get include: " + includes[x]); else - assertTrue("PR:BZ23478 Expected:"+includes[x] +" Got:"+ myInclude.getIncludeName(), includes[x].equals(myInclude.getIncludeName())); + assertTrue("PR:23478 Expected:"+includes[x] +" Got:"+ myInclude.getIncludeName(), includes[x].equals(myInclude.getIncludeName())); } @@ -388,7 +379,7 @@ public class TranslationUnitTests extends TestCase { ExpectedStrings myExp= new ExpectedStrings(includes); int x; TranslationUnit myTranslationUnit=CProjectHelper.findTranslationUnit(testProject,"exetest.c"); - fail("Unable to test because we can't get the name of an include file (PR: BZ23478"); + fail("PR:23478 Unable to test because we can't get the name of an include file"); myIncludes=myTranslationUnit.getIncludes(); for (x=0;x