From 2d7ddbfe87a2469e66132749641d9ffa309182cd Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Mon, 11 Feb 2019 12:00:54 -0800 Subject: better test tidyup --- testing/figures-coverage/bin/figures/Checks.class | Bin 3232 -> 0 bytes testing/figures-coverage/bin/figures/Debug.class | Bin 1656 -> 0 bytes testing/figures-coverage/bin/figures/Element.class | Bin 109 -> 0 bytes testing/figures-coverage/bin/figures/Figure.class | Bin 13444 -> 0 bytes .../figures-coverage/bin/figures/FigureElement.class | Bin 398 -> 0 bytes testing/figures-coverage/bin/figures/Main$TestGUI.class | Bin 425 -> 0 bytes testing/figures-coverage/bin/figures/Main.class | Bin 1045 -> 0 bytes testing/figures-coverage/bin/figures/Test.class | Bin 4129 -> 0 bytes .../bin/figures/composites/BoundedLine.class | Bin 296 -> 0 bytes .../figures-coverage/bin/figures/composites/Line.class | Bin 275 -> 0 bytes .../bin/figures/composites/Square.class | Bin 353 -> 0 bytes .../bin/figures/primitives/planar/BoundedPoint.class | Bin 420 -> 0 bytes .../bin/figures/primitives/planar/Point.class | Bin 5094 -> 0 bytes .../primitives/planar/PointBoundsException.class | Bin 325 -> 0 bytes .../primitives/planar/StrictlyBoundedPoint.class | Bin 443 -> 0 bytes .../bin/figures/primitives/solid/SolidPoint.class | Bin 1573 -> 0 bytes .../org/aspectj/testing/util/StructureModelUtil.java | 12 ++++++------ .../aspectj/testing/util/StructureModelUtilTest.java | 1 + 18 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 testing/figures-coverage/bin/figures/Checks.class delete mode 100644 testing/figures-coverage/bin/figures/Debug.class delete mode 100644 testing/figures-coverage/bin/figures/Element.class delete mode 100644 testing/figures-coverage/bin/figures/Figure.class delete mode 100644 testing/figures-coverage/bin/figures/FigureElement.class delete mode 100644 testing/figures-coverage/bin/figures/Main$TestGUI.class delete mode 100644 testing/figures-coverage/bin/figures/Main.class delete mode 100644 testing/figures-coverage/bin/figures/Test.class delete mode 100644 testing/figures-coverage/bin/figures/composites/BoundedLine.class delete mode 100644 testing/figures-coverage/bin/figures/composites/Line.class delete mode 100644 testing/figures-coverage/bin/figures/composites/Square.class delete mode 100644 testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class delete mode 100644 testing/figures-coverage/bin/figures/primitives/planar/Point.class delete mode 100644 testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class delete mode 100644 testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class delete mode 100644 testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class (limited to 'testing') diff --git a/testing/figures-coverage/bin/figures/Checks.class b/testing/figures-coverage/bin/figures/Checks.class deleted file mode 100644 index 729d06c42..000000000 Binary files a/testing/figures-coverage/bin/figures/Checks.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/Debug.class b/testing/figures-coverage/bin/figures/Debug.class deleted file mode 100644 index da1dcc1f8..000000000 Binary files a/testing/figures-coverage/bin/figures/Debug.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/Element.class b/testing/figures-coverage/bin/figures/Element.class deleted file mode 100644 index ef4f449fa..000000000 Binary files a/testing/figures-coverage/bin/figures/Element.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/Figure.class b/testing/figures-coverage/bin/figures/Figure.class deleted file mode 100644 index 98685e17c..000000000 Binary files a/testing/figures-coverage/bin/figures/Figure.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/FigureElement.class b/testing/figures-coverage/bin/figures/FigureElement.class deleted file mode 100644 index c77045592..000000000 Binary files a/testing/figures-coverage/bin/figures/FigureElement.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/Main$TestGUI.class b/testing/figures-coverage/bin/figures/Main$TestGUI.class deleted file mode 100644 index 94fdfabaf..000000000 Binary files a/testing/figures-coverage/bin/figures/Main$TestGUI.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/Main.class b/testing/figures-coverage/bin/figures/Main.class deleted file mode 100644 index 41a9482e2..000000000 Binary files a/testing/figures-coverage/bin/figures/Main.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/Test.class b/testing/figures-coverage/bin/figures/Test.class deleted file mode 100644 index 04768405a..000000000 Binary files a/testing/figures-coverage/bin/figures/Test.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/composites/BoundedLine.class b/testing/figures-coverage/bin/figures/composites/BoundedLine.class deleted file mode 100644 index 12eda2226..000000000 Binary files a/testing/figures-coverage/bin/figures/composites/BoundedLine.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/composites/Line.class b/testing/figures-coverage/bin/figures/composites/Line.class deleted file mode 100644 index ceb1b35dd..000000000 Binary files a/testing/figures-coverage/bin/figures/composites/Line.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/composites/Square.class b/testing/figures-coverage/bin/figures/composites/Square.class deleted file mode 100644 index 9334b6836..000000000 Binary files a/testing/figures-coverage/bin/figures/composites/Square.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class b/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class deleted file mode 100644 index 6d51d46e3..000000000 Binary files a/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/primitives/planar/Point.class b/testing/figures-coverage/bin/figures/primitives/planar/Point.class deleted file mode 100644 index c14c89149..000000000 Binary files a/testing/figures-coverage/bin/figures/primitives/planar/Point.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class b/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class deleted file mode 100644 index d62ce0f17..000000000 Binary files a/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class b/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class deleted file mode 100644 index 9f985f6a2..000000000 Binary files a/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class and /dev/null differ diff --git a/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class b/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class deleted file mode 100644 index f95982af8..000000000 Binary files a/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class and /dev/null differ diff --git a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java index 10e03dd22..cd3727e9b 100644 --- a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java +++ b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java @@ -144,9 +144,9 @@ public class StructureModelUtil { * @return the set of aspects with advice that affects the specified package */ public static Set getAspectsAffectingPackage(IProgramElement packageNode) { - List files = StructureModelUtil.getFilesInPackage(packageNode); + List files = StructureModelUtil.getFilesInPackage(packageNode); Set aspects = new HashSet(); - for (Iterator it = files.iterator(); it.hasNext();) { + for (Iterator it = files.iterator(); it.hasNext();) { IProgramElement fileNode = (IProgramElement) it.next(); Map adviceMap = getLinesToAspectMap(fileNode.getSourceLocation().getSourceFile().getAbsolutePath()); Collection values = adviceMap.values(); @@ -243,15 +243,15 @@ public class StructureModelUtil { /** * @return all of the AspectJ and Java source files in a package */ - public static List getFilesInPackage(IProgramElement packageNode) { - List packageContents; + public static List getFilesInPackage(IProgramElement packageNode) { + List packageContents; if (packageNode == null) { return null; } else { packageContents = packageNode.getChildren(); } - List files = new ArrayList(); - for (Iterator it = packageContents.iterator(); it.hasNext();) { + List files = new ArrayList(); + for (Iterator it = packageContents.iterator(); it.hasNext();) { IProgramElement packageItem = (IProgramElement) it.next(); if (packageItem.getKind() == IProgramElement.Kind.FILE_JAVA || packageItem.getKind() == IProgramElement.Kind.FILE_ASPECTJ) { diff --git a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java index e3f91decc..366727b80 100644 --- a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java +++ b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java @@ -67,6 +67,7 @@ public class StructureModelUtilTest extends AjdeCoreTestCase { } protected void setUp() throws Exception { + super.setUp(); initialiseProject("figures-coverage"); TestCompilerConfiguration compilerConfig = (TestCompilerConfiguration) getCompiler().getCompilerConfiguration(); compilerConfig.setProjectSourceFiles(getSourceFileList(files)); -- cgit v1.2.3