diff options
Diffstat (limited to 'ajdoc')
4 files changed, 75 insertions, 28 deletions
diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java b/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java index 655eb4aca..f189b6c61 100644 --- a/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java +++ b/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java @@ -112,6 +112,7 @@ class HtmlDecorator { filename = base + decl.getSignature() + ".html"; } if (!exceededNestingLevel) { + decorateHTMLFile(new File(filename)); decorateHTMLFromDecls(decl.getDeclarations(), @@ -137,9 +138,16 @@ class HtmlDecorator { } } + /** + * Skips files that are public in the model but not public in the source, + * e.g. nested aspects. + */ static void decorateHTMLFile(File file) throws IOException { - System.out.println( "> Decorating " + file.getCanonicalPath() + "..." ); - BufferedReader reader = new BufferedReader(new FileReader(file)); + if (!file.exists()) return; + + System.out.println( "> Decorating " + file.getCanonicalPath() + "..." ); + BufferedReader reader = new BufferedReader(new FileReader(file)); + StringBuffer fileContents = new StringBuffer(); String line = reader.readLine(); while( line != null ) { diff --git a/ajdoc/testdata/coverage/foo/PkgVisibleClass.java b/ajdoc/testdata/coverage/foo/PkgVisibleClass.java new file mode 100644 index 000000000..44941bb71 --- /dev/null +++ b/ajdoc/testdata/coverage/foo/PkgVisibleClass.java @@ -0,0 +1,12 @@ +/** + * @author Mik Kersten + */ +class PkgVisibleClass { + + static class NestedClass { } + + static aspect NestedAspect { } + + private static aspect PrivateNestedAspect { } + +} diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java index 8b7df063e..a7dd01974 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java @@ -21,22 +21,23 @@ import junit.framework.TestCase; * @author Mik Kersten */ public class CoverageTestCase extends TestCase { + + File file0 = new File("testdata/coverage/InDefaultPackage.java"); + File file1 = new File("testdata/coverage/foo/ClassA.java"); + File aspect1 = new File("testdata/coverage/foo/UseThisAspectForLinkCheck.aj"); + File file2 = new File("testdata/coverage/foo/InterfaceI.java"); + File file3 = new File("testdata/coverage/foo/PlainJava.java"); + File file4 = new File("testdata/coverage/foo/ModelCoverage.java"); + File file5 = new File("testdata/coverage/fluffy/Fluffy.java"); + File file6 = new File("testdata/coverage/fluffy/bunny/Bunny.java"); + File file7 = new File("testdata/coverage/fluffy/bunny/rocks/Rocks.java"); + File file8 = new File("testdata/coverage/fluffy/bunny/rocks/UseThisAspectForLinkCheckToo.java"); + File file9 = new File("testdata/coverage/foo/PkgVisibleClass.java"); + + File outdir = new File("testdata/coverage/doc"); public void testCoverage() { - -// System.err.println(new File("testdata/figures-demo").exists()); - File file0 = new File("testdata/coverage/InDefaultPackage.java"); - File file1 = new File("testdata/coverage/foo/ClassA.java"); - File aspect1 = new File("testdata/coverage/foo/UseThisAspectForLinkCheck.aj"); - File file2 = new File("testdata/coverage/foo/InterfaceI.java"); - File file3 = new File("testdata/coverage/foo/PlainJava.java"); - File file4 = new File("testdata/coverage/foo/ModelCoverage.java"); - File file5 = new File("testdata/coverage/fluffy/Fluffy.java"); - File file6 = new File("testdata/coverage/fluffy/bunny/Bunny.java"); - File file7 = new File("testdata/coverage/fluffy/bunny/rocks/Rocks.java"); - File file8 = new File("testdata/coverage/fluffy/bunny/rocks/UseThisAspectForLinkCheckToo.java"); - File outdir = new File("testdata/coverage/doc"); - + outdir.delete(); String[] args = { // "-XajdocDebug", "-source", @@ -53,20 +54,31 @@ public class CoverageTestCase extends TestCase { file5.getAbsolutePath(), file6.getAbsolutePath(), file7.getAbsolutePath(), - file8.getAbsolutePath() + file8.getAbsolutePath(), + file9.getAbsolutePath() }; - org.aspectj.tools.ajdoc.Main.main(args); } + public void testCoveragePublicMode() { + outdir.delete(); + String[] args = { + "-public", + "-source", + "1.4", + "-d", + outdir.getAbsolutePath(), + file3.getAbsolutePath(), + file9.getAbsolutePath() + }; + org.aspectj.tools.ajdoc.Main.main(args); + } + // public void testPlainJava() { -// File file1 = new File("testdata/coverage/foo/PlainJava.java"); -// File outdir = new File("testdata/coverage/doc"); -// +// outdir.delete(); // String[] args = { "-d", // outdir.getAbsolutePath(), -// file1.getAbsolutePath() }; -// +// file3.getAbsolutePath() }; // org.aspectj.tools.ajdoc.Main.main(args); // } diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java index b90d74900..7556234e6 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/SpacewarTestCase.java @@ -20,9 +20,12 @@ import junit.framework.TestCase; */ public class SpacewarTestCase extends TestCase { + protected void setUp() throws Exception { + super.setUp(); + new File("testdata/spacewar/docdir").delete(); + } + public void testSimpleExample() { - -// System.err.println(new File("testdata/figures-demo").exists()); File outdir = new File("testdata/spacewar/docdir"); File sourcepath = new File("testdata/spacewar"); @@ -34,12 +37,24 @@ public class SpacewarTestCase extends TestCase { "coordination" }; org.aspectj.tools.ajdoc.Main.main(args); - assertTrue(true); } - protected void setUp() throws Exception { - super.setUp(); + public void testPublicModeExample() { + File outdir = new File("testdata/spacewar/docdir"); + File sourcepath = new File("testdata/spacewar"); + + String[] args = { + "-public", + "-d", + outdir.getAbsolutePath(), + "-sourcepath", + sourcepath.getAbsolutePath(), + "spacewar", + "coordination" }; + + org.aspectj.tools.ajdoc.Main.main(args); + assertTrue(true); } protected void tearDown() throws Exception { |