From 9f6973e7ae946329f301bb01877b4b52c91fdd09 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 22 Sep 2005 21:56:40 +0400 Subject: [PATCH] IDEADEV-2514 --- .../InspectionsBundle.properties | 3 ++ .../duplicateDeprecated/expected.xml | 9 ++++ .../duplicateDeprecated/src/Foo.java | 7 +++ .../duplicateParam/expected.xml | 9 ++++ .../duplicateParam/src/Foo.java | 9 ++++ .../duplicateReturn/expected.xml | 8 ++++ .../duplicateReturn/src/Foo.java | 9 ++++ .../duplicateSerial/expected.xml | 9 ++++ .../duplicateSerial/src/Foo.java | 8 ++++ .../duplicateThrows/expected.xml | 9 ++++ .../duplicateThrows/src/Foo.java | 9 ++++ .../codeInspection/JavaDocInspectionTest.java | 46 +++++++++++++++++++ 12 files changed, 135 insertions(+) create mode 100644 testData/inspection/javaDocInspection/duplicateDeprecated/expected.xml create mode 100644 testData/inspection/javaDocInspection/duplicateDeprecated/src/Foo.java create mode 100644 testData/inspection/javaDocInspection/duplicateParam/expected.xml create mode 100644 testData/inspection/javaDocInspection/duplicateParam/src/Foo.java create mode 100644 testData/inspection/javaDocInspection/duplicateReturn/expected.xml create mode 100644 testData/inspection/javaDocInspection/duplicateReturn/src/Foo.java create mode 100644 testData/inspection/javaDocInspection/duplicateSerial/expected.xml create mode 100644 testData/inspection/javaDocInspection/duplicateSerial/src/Foo.java create mode 100644 testData/inspection/javaDocInspection/duplicateThrows/expected.xml create mode 100644 testData/inspection/javaDocInspection/duplicateThrows/src/Foo.java create mode 100644 testSource/com/intellij/codeInspection/JavaDocInspectionTest.java diff --git a/openapi/src/com/intellij/codeInspection/InspectionsBundle.properties b/openapi/src/com/intellij/codeInspection/InspectionsBundle.properties index afa357b0ceb8..4a8d452b43a1 100644 --- a/openapi/src/com/intellij/codeInspection/InspectionsBundle.properties +++ b/openapi/src/com/intellij/codeInspection/InspectionsBundle.properties @@ -262,6 +262,9 @@ inspection.javadoc.method.problem.descriptor=Description is missing in {0} tag f inspection.javadoc.method.problem.descriptor1=Description is missing in {0} tag. inspection.javadoc.method.problem.descriptor2={0} tag description is missing. inspection.javadoc.method.problem.descriptor3=Required tag {0} is missing for parameter {1} +inspection.javadoc.problem.duplicate.param=Duplicate @param tag for parameter ''{0}'' +inspection.javadoc.problem.duplicate.throws=Duplicate @throws or @exception tag for exception ''{0}'' +inspection.javadoc.problem.duplicate.tag=Duplicate @{0} tag inspection.export.results.abstract=abstract inspection.export.results.static=static diff --git a/testData/inspection/javaDocInspection/duplicateDeprecated/expected.xml b/testData/inspection/javaDocInspection/duplicateDeprecated/expected.xml new file mode 100644 index 000000000000..75c4fbf6fd81 --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateDeprecated/expected.xml @@ -0,0 +1,9 @@ + + + + Foo.java + 4 + Duplicate @deprecated tag + + + diff --git a/testData/inspection/javaDocInspection/duplicateDeprecated/src/Foo.java b/testData/inspection/javaDocInspection/duplicateDeprecated/src/Foo.java new file mode 100644 index 000000000000..fe8b4e640532 --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateDeprecated/src/Foo.java @@ -0,0 +1,7 @@ +/** + * Test. + * @deprecated You bet. + * @deprecated Gotcha. + */ +class Foo { +} diff --git a/testData/inspection/javaDocInspection/duplicateParam/expected.xml b/testData/inspection/javaDocInspection/duplicateParam/expected.xml new file mode 100644 index 000000000000..42959e7befbf --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateParam/expected.xml @@ -0,0 +1,9 @@ + + + + Foo.java + 5 + Duplicate @param tag for parameter 's' + + + diff --git a/testData/inspection/javaDocInspection/duplicateParam/src/Foo.java b/testData/inspection/javaDocInspection/duplicateParam/src/Foo.java new file mode 100644 index 000000000000..50f0fc2d7205 --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateParam/src/Foo.java @@ -0,0 +1,9 @@ +class Test { + /** + * Test. + * @param s my string + * @param s another string + */ + void test(String s) { + } +} \ No newline at end of file diff --git a/testData/inspection/javaDocInspection/duplicateReturn/expected.xml b/testData/inspection/javaDocInspection/duplicateReturn/expected.xml new file mode 100644 index 000000000000..59c11f6738e1 --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateReturn/expected.xml @@ -0,0 +1,8 @@ + + + + Foo.java + 5 + Duplicate @return tag + + diff --git a/testData/inspection/javaDocInspection/duplicateReturn/src/Foo.java b/testData/inspection/javaDocInspection/duplicateReturn/src/Foo.java new file mode 100644 index 000000000000..2e812a0146ee --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateReturn/src/Foo.java @@ -0,0 +1,9 @@ +class Test { + /** + * Test. + * @return my string + * @return another string + */ + String test() { + } +} \ No newline at end of file diff --git a/testData/inspection/javaDocInspection/duplicateSerial/expected.xml b/testData/inspection/javaDocInspection/duplicateSerial/expected.xml new file mode 100644 index 000000000000..b36fb1511831 --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateSerial/expected.xml @@ -0,0 +1,9 @@ + + + + Foo.java + 5 + Duplicate @serial tag + + + diff --git a/testData/inspection/javaDocInspection/duplicateSerial/src/Foo.java b/testData/inspection/javaDocInspection/duplicateSerial/src/Foo.java new file mode 100644 index 000000000000..abc54c3d4ca0 --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateSerial/src/Foo.java @@ -0,0 +1,8 @@ +class Test { + /** + * Test. + * @serial something + * @serial something else + */ + private int a; +} \ No newline at end of file diff --git a/testData/inspection/javaDocInspection/duplicateThrows/expected.xml b/testData/inspection/javaDocInspection/duplicateThrows/expected.xml new file mode 100644 index 000000000000..a525a68940e0 --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateThrows/expected.xml @@ -0,0 +1,9 @@ + + + + Foo.java + 5 + Duplicate @throws tag for exception 'java.lang.Exception' + + + diff --git a/testData/inspection/javaDocInspection/duplicateThrows/src/Foo.java b/testData/inspection/javaDocInspection/duplicateThrows/src/Foo.java new file mode 100644 index 000000000000..a3f8819068b8 --- /dev/null +++ b/testData/inspection/javaDocInspection/duplicateThrows/src/Foo.java @@ -0,0 +1,9 @@ +class Test { + /** + * Test. + * @throws java.lang.Exception in case of problems + * @exception java.lang.Exception in case of other problems + */ + void test() throws java.lang.Exception { + } +} \ No newline at end of file diff --git a/testSource/com/intellij/codeInspection/JavaDocInspectionTest.java b/testSource/com/intellij/codeInspection/JavaDocInspectionTest.java new file mode 100644 index 000000000000..54c160e60738 --- /dev/null +++ b/testSource/com/intellij/codeInspection/JavaDocInspectionTest.java @@ -0,0 +1,46 @@ +package com.intellij.codeInspection; + +import com.intellij.codeInspection.javaDoc.JavaDocInspection; + +/** + * Created by IntelliJ IDEA. + * User: yole + * Date: 22.09.2005 + * Time: 20:24:19 + * To change this template use File | Settings | File Templates. + */ +public class JavaDocInspectionTest extends InspectionTestCase { + private JavaDocInspection myTool; + + protected void setUp() throws Exception { + super.setUp(); + myTool = new JavaDocInspection(); + myTool.initialize(getManager()); + } + + private void doTest() throws Exception { + doTest("javaDocInspection/" + getTestName(false), myTool); + } + + public void testDuplicateParam() throws Exception { + doTest(); + } + + public void testDuplicateReturn() throws Exception { + doTest(); + } + + // tests for duplicate class tags + public void testDuplicateDeprecated() throws Exception { + doTest(); + } + + // tests for duplicate field tags + public void testDuplicateSerial() throws Exception { + doTest(); + } + + public void testDuplicateThrows() throws Exception { + doTest(); + } +}