You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2015/03/12 21:57:53 UTC
[2/2] git commit: [flex-utilities]
[refs/heads/feature/pmd-5.2-language-module] - - Switched back to JUnit (The
PMD test framework relys on JUnit). - Corrected the package names in the rule
xml files. - Added a first dummy rule test to the core module.
- Switched back to JUnit (The PMD test framework relys on JUnit).
- Corrected the package names in the rule xml files.
- Added a first dummy rule test to the core module.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/526c1e73
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/526c1e73
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/526c1e73
Branch: refs/heads/feature/pmd-5.2-language-module
Commit: 526c1e73e0daca5519e823039d23f2a08c73947c
Parents: 14e8771
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Mar 12 21:57:41 2015 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Mar 12 21:57:41 2015 +0100
----------------------------------------------------------------------
.../language-module/parser/parser-impl/pom.xml | 6 +-
.../parser/impl/AbstractAs3ParserTestBase.java | 4 +-
.../parser/impl/AbstractStatementTestBase.java | 4 +-
.../flex/pmd/parser/impl/NestedNodeTest.java | 8 +-
.../apache/flex/pmd/parser/impl/NodeTest.java | 4 +-
.../flex/pmd/parser/impl/TestAS3Parser.java | 4 +-
.../flex/pmd/parser/impl/TestAS3Scanner.java | 7 +-
.../parser/impl/TestAS3ScannerWithFiles.java | 13 +-
.../apache/flex/pmd/parser/impl/TestClass.java | 2 +-
.../flex/pmd/parser/impl/TestClassContent.java | 8 +-
.../pmd/parser/impl/TestCompilationUnit.java | 6 +-
.../pmd/parser/impl/TestConstStatement.java | 2 +-
.../flex/pmd/parser/impl/TestDoStatement.java | 2 +-
.../flex/pmd/parser/impl/TestE4xExpression.java | 2 +-
.../pmd/parser/impl/TestEmptyStatement.java | 2 +-
.../flex/pmd/parser/impl/TestExpression.java | 2 +-
.../flex/pmd/parser/impl/TestForStatement.java | 2 +-
.../flex/pmd/parser/impl/TestIfStatement.java | 2 +-
.../flex/pmd/parser/impl/TestInterface.java | 6 +-
.../pmd/parser/impl/TestInterfaceContent.java | 6 +-
.../pmd/parser/impl/TestPackageContent.java | 6 +-
.../pmd/parser/impl/TestPrimaryExpression.java | 6 +-
.../pmd/parser/impl/TestReturnStatement.java | 2 +-
.../pmd/parser/impl/TestSwitchStatement.java | 2 +-
.../impl/TestTryCatchFinallyStatement.java | 2 +-
.../pmd/parser/impl/TestUnaryExpression.java | 2 +-
.../flex/pmd/parser/impl/TestVarStatement.java | 2 +-
.../pmd/parser/impl/TestWhileStatement.java | 2 +-
FlexPMD/language-module/pmd-flex/pom.xml | 12 ++
.../org/apache/flex/pmd/rule/BasicTest.java | 11 +-
.../xml/ViewComponentReferencedInModelRule.xml | 186 +++++++++++++++++++
.../org/apache/flex/pmd/rule/xml/simpletest.xml | 186 -------------------
.../ruleset/ruleset-flex-basic/pom.xml | 6 +-
.../resources/rulesets/flex/architecture.xml | 19 +-
.../src/main/resources/rulesets/flex/asdocs.xml | 6 +-
.../main/resources/rulesets/flex/basic_mxml.xml | 10 +-
.../main/resources/rulesets/flex/binding.xml | 6 +-
.../main/resources/rulesets/flex/cairngorm.xml | 12 +-
.../main/resources/rulesets/flex/component.xml | 4 +-
.../src/main/resources/rulesets/flex/css.xml | 4 +-
.../src/main/resources/rulesets/flex/empty.xml | 4 +-
.../src/main/resources/rulesets/flex/event.xml | 16 +-
.../main/resources/rulesets/flex/flexunit.xml | 2 +-
.../resources/rulesets/flex/indentation.xml | 2 +-
.../resources/rulesets/flex/maintanability.xml | 38 ++--
.../main/resources/rulesets/flex/multitouch.xml | 4 +-
.../src/main/resources/rulesets/flex/naming.xml | 22 +--
.../main/resources/rulesets/flex/parsley.xml | 14 +-
.../resources/rulesets/flex/performance.xml | 24 +--
.../main/resources/rulesets/flex/security.xml | 12 +-
.../src/main/resources/rulesets/flex/sizing.xml | 14 +-
.../src/main/resources/rulesets/flex/style.xml | 10 +-
.../main/resources/rulesets/flex/switches.xml | 10 +-
.../src/main/resources/rulesets/flex/unused.xml | 10 +-
.../flex/pmd/rules/AbstractFlexRuleTest.java | 11 +-
.../pmd/rules/AbstractRegExpBasedRuleTest.java | 17 +-
.../performance/BindableClassRuleTest.java | 2 +-
.../unused/UnusedLocalVariableRuleTest.java | 2 +-
.../rules/unused/UnusedParameterRuleTest.java | 2 +-
59 files changed, 406 insertions(+), 388 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/pom.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/pom.xml b/FlexPMD/language-module/parser/parser-impl/pom.xml
index 6a9275b..3a9c0cb 100644
--- a/FlexPMD/language-module/parser/parser-impl/pom.xml
+++ b/FlexPMD/language-module/parser/parser-impl/pom.xml
@@ -44,9 +44,9 @@
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.8</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractAs3ParserTestBase.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractAs3ParserTestBase.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractAs3ParserTestBase.java
index 7bf16c3..a90eea0 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractAs3ParserTestBase.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractAs3ParserTestBase.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.IParserNode;
-import org.testng.annotations.BeforeMethod;
+import org.junit.Before;
public abstract class AbstractAs3ParserTestBase {
@@ -65,7 +65,7 @@ public abstract class AbstractAs3ParserTestBase {
protected AS3Parser asp;
protected AS3Scanner scn;
- @BeforeMethod(alwaysRun = true)
+ @Before
public void setUp() {
asp = new AS3Parser(null);
scn = asp.getScn();
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractStatementTestBase.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractStatementTestBase.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractStatementTestBase.java
index 4bf1dca..b80b0fc 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractStatementTestBase.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/AbstractStatementTestBase.java
@@ -16,7 +16,7 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.exceptions.TokenException;
@@ -28,7 +28,7 @@ public abstract class AbstractStatementTestBase extends AbstractAs3ParserTestBas
scn.setLines(new String[] {input, "__END__"});
asp.nextToken();
final String result = new ASTToXMLConverter().convert(asp.parseStatement());
- assertEquals(expected, result, message);
+ assertEquals(message, expected, result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NestedNodeTest.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NestedNodeTest.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NestedNodeTest.java
index 4d50d65..d1b5f2b 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NestedNodeTest.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NestedNodeTest.java
@@ -16,19 +16,19 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.NodeKind;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.Before;
+import org.junit.Test;
public class NestedNodeTest extends AbstractAs3ParserTestBase {
private NestedNode function;
@Override
- @BeforeMethod
+ @Before
public void setUp() {
super.setUp();
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NodeTest.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NodeTest.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NodeTest.java
index ca59b93..624b0fa 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NodeTest.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/NodeTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class NodeTest extends AbstractAs3ParserTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Parser.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Parser.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Parser.java
index 2860721..7d1f903 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Parser.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Parser.java
@@ -16,12 +16,12 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.IParserNode;
import org.apache.flex.pmd.parser.exceptions.TokenException;
import org.apache.flex.pmd.utils.FileUtils;
-import org.testng.annotations.Test;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Scanner.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Scanner.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Scanner.java
index 5e930f3..4c43f46 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Scanner.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3Scanner.java
@@ -16,10 +16,10 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.ast.Token;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestAS3Scanner extends AbstractAs3ParserTestBase {
@@ -304,8 +304,7 @@ public class TestAS3Scanner extends AbstractAs3ParserTestBase {
private void assertText(final String message,
final String text) {
Token token = scn.nextToken();
- assertEquals(text,
- token.getText(), message);
+ assertEquals(message, text, token.getText());
}
private String join(final String[] lines,
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3ScannerWithFiles.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3ScannerWithFiles.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3ScannerWithFiles.java
index 2cd057f..6869626 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3ScannerWithFiles.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestAS3ScannerWithFiles.java
@@ -16,11 +16,12 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.ast.Token;
import org.apache.flex.pmd.utils.FileUtils;
-import org.testng.annotations.Test;
+import org.junit.Ignore;
+import org.junit.Test;
import java.io.File;
import java.io.IOException;
@@ -28,8 +29,8 @@ import java.net.URISyntaxException;
public class TestAS3ScannerWithFiles extends AbstractAs3ParserTestBase {
- @Test(enabled = false)
- // Simple.as has the completely wrong structure ... have to fix this first.
+ @Test
+ @Ignore("Simple.as has the completely wrong structure ... have to fix this first.")
public void testSimple() throws IOException,
URISyntaxException {
final String[] expected = new String[]
@@ -53,9 +54,9 @@ public class TestAS3ScannerWithFiles extends AbstractAs3ParserTestBase {
";",
"}",
"}"};
-/* assertFile( expected,
+ assertFile( expected,
"Simple.as" );
-*/
+
}
private void assertFile(final String[] expected,
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClass.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClass.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClass.java
index 600d6d2..8319194 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClass.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClass.java
@@ -16,7 +16,7 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.exceptions.TokenException;
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClassContent.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClassContent.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClassContent.java
index 124c339..3b04ced 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClassContent.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestClassContent.java
@@ -16,10 +16,10 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestClassContent extends AbstractAs3ParserTestBase {
@@ -270,7 +270,7 @@ public class TestClassContent extends AbstractAs3ParserTestBase {
asp.nextToken(); // first call
asp.nextToken(); // skip {
final String result = new ASTToXMLConverter().convert(asp.parseClassContent());
- assertEquals("<content line=\"2\">" + expected + "</content>", result, message);
+ assertEquals(message, "<content line=\"2\">" + expected + "</content>", result);
}
private void assertClassContent(final String message,
@@ -280,6 +280,6 @@ public class TestClassContent extends AbstractAs3ParserTestBase {
asp.nextToken(); // first call
asp.nextToken(); // skip {
final String result = new ASTToXMLConverter().convert(asp.parseClassContent());
- assertEquals("<content line=\"2\">" + expected + "</content>", result, message);
+ assertEquals(message, "<content line=\"2\">" + expected + "</content>", result);
}
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestCompilationUnit.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestCompilationUnit.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestCompilationUnit.java
index a59d9c3..99ad0f0 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestCompilationUnit.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestCompilationUnit.java
@@ -16,10 +16,10 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestCompilationUnit extends AbstractAs3ParserTestBase {
@@ -79,6 +79,6 @@ public class TestCompilationUnit extends AbstractAs3ParserTestBase {
{input,
"__END__"});
final String result = new ASTToXMLConverter().convert(asp.parseCompilationUnit());
- assertEquals(expected, result, message);
+ assertEquals(message, expected, result);
}
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestConstStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestConstStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestConstStatement.java
index 5743275..e2fd635 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestConstStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestConstStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestConstStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestDoStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestDoStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestDoStatement.java
index d650f0a..11f03fe 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestDoStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestDoStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestDoStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestE4xExpression.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestE4xExpression.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestE4xExpression.java
index 3ad142a..2449082 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestE4xExpression.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestE4xExpression.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestE4xExpression extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestEmptyStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestEmptyStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestEmptyStatement.java
index 454744a..04a1c73 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestEmptyStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestEmptyStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestEmptyStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestExpression.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestExpression.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestExpression.java
index bda05e8..c77aebb 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestExpression.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestExpression.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestExpression extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestForStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestForStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestForStatement.java
index 8560c13..2be367b 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestForStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestForStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestForStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestIfStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestIfStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestIfStatement.java
index 06c2f7f..04f36d6 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestIfStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestIfStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestIfStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterface.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterface.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterface.java
index cf27b05..43fdd9a 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterface.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterface.java
@@ -16,10 +16,10 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestInterface extends AbstractAs3ParserTestBase {
@@ -66,7 +66,7 @@ public class TestInterface extends AbstractAs3ParserTestBase {
asp.nextToken(); // first call
asp.nextToken(); // skip {
final String result = new ASTToXMLConverter().convert(asp.parsePackageContent());
- assertEquals(expected, result, message);
+ assertEquals(message, expected, result);
}
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterfaceContent.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterfaceContent.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterfaceContent.java
index ea99d9b..db2fe8e 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterfaceContent.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestInterfaceContent.java
@@ -16,10 +16,10 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestInterfaceContent extends AbstractAs3ParserTestBase {
@@ -83,6 +83,6 @@ public class TestInterfaceContent extends AbstractAs3ParserTestBase {
asp.nextToken(); // first call
asp.nextToken(); // skip {
final String result = new ASTToXMLConverter().convert(asp.parseInterfaceContent());
- assertEquals("<content line=\"2\">" + expected + "</content>", result, message);
+ assertEquals(message, "<content line=\"2\">" + expected + "</content>", result);
}
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPackageContent.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPackageContent.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPackageContent.java
index 224a0dd..230ec1d 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPackageContent.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPackageContent.java
@@ -16,10 +16,10 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestPackageContent extends AbstractAs3ParserTestBase {
@@ -199,6 +199,6 @@ public class TestPackageContent extends AbstractAs3ParserTestBase {
asp.nextToken(); // first call
asp.nextToken(); // skip {
final String result = new ASTToXMLConverter().convert(asp.parsePackageContent());
- assertEquals(expected, result, message);
+ assertEquals(message, expected, result);
}
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPrimaryExpression.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPrimaryExpression.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPrimaryExpression.java
index 81a8730..28b1ef2 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPrimaryExpression.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestPrimaryExpression.java
@@ -16,10 +16,10 @@
*/
package org.apache.flex.pmd.parser.impl;
-import static org.testng.Assert.*;
+import static org.junit.Assert.*;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestPrimaryExpression extends AbstractAs3ParserTestBase {
@@ -96,7 +96,7 @@ public class TestPrimaryExpression extends AbstractAs3ParserTestBase {
"__END__"});
asp.nextToken();
final String result = new ASTToXMLConverter().convert(asp.parsePrimaryExpression());
- assertEquals("<primary line=\"1\">" + expected + "</primary>", result, "unexpected");
+ assertEquals("unexpected", "<primary line=\"1\">" + expected + "</primary>", result);
}
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestReturnStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestReturnStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestReturnStatement.java
index 8110a05..2050d6f 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestReturnStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestReturnStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestReturnStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestSwitchStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestSwitchStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestSwitchStatement.java
index 284cc6b..919d630 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestSwitchStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestSwitchStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestSwitchStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestTryCatchFinallyStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestTryCatchFinallyStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestTryCatchFinallyStatement.java
index 190f129..4f3d332 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestTryCatchFinallyStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestTryCatchFinallyStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestTryCatchFinallyStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestUnaryExpression.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestUnaryExpression.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestUnaryExpression.java
index 5cc2b01..1f1d5b1 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestUnaryExpression.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestUnaryExpression.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestUnaryExpression extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestVarStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestVarStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestVarStatement.java
index 325ed06..b18ebff 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestVarStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestVarStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestVarStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestWhileStatement.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestWhileStatement.java b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestWhileStatement.java
index 6cd12dc..db4f6ac 100644
--- a/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestWhileStatement.java
+++ b/FlexPMD/language-module/parser/parser-impl/src/test/java/org/apache/flex/pmd/parser/impl/TestWhileStatement.java
@@ -17,7 +17,7 @@
package org.apache.flex.pmd.parser.impl;
import org.apache.flex.pmd.parser.exceptions.TokenException;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class TestWhileStatement extends AbstractStatementTestBase {
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/pmd-flex/pom.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/pmd-flex/pom.xml b/FlexPMD/language-module/pmd-flex/pom.xml
index 15e2676..3164f05 100644
--- a/FlexPMD/language-module/pmd-flex/pom.xml
+++ b/FlexPMD/language-module/pmd-flex/pom.xml
@@ -43,6 +43,12 @@
<artifactId>parser-impl</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.flex.pmd.ruleset</groupId>
+ <artifactId>ruleset-flex-basic</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>net.sourceforge.pmd</groupId>
@@ -50,6 +56,12 @@
<version>${pmd.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/pmd-flex/src/test/java/org/apache/flex/pmd/rule/BasicTest.java
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/pmd-flex/src/test/java/org/apache/flex/pmd/rule/BasicTest.java b/FlexPMD/language-module/pmd-flex/src/test/java/org/apache/flex/pmd/rule/BasicTest.java
index 8d21143..6d2ce33 100644
--- a/FlexPMD/language-module/pmd-flex/src/test/java/org/apache/flex/pmd/rule/BasicTest.java
+++ b/FlexPMD/language-module/pmd-flex/src/test/java/org/apache/flex/pmd/rule/BasicTest.java
@@ -5,12 +5,13 @@ import net.sourceforge.pmd.testframework.SimpleAggregatorTst;
/**
* Created by christoferdutz on 06.03.15.
*/
-public class BasicTest extends SimpleAggregatorTst {
+public class BasicTest /*extends SimpleAggregatorTst*/ {
- private static final String RULESET = "flex-basic";
+ private static final String RULESET = "flex-architecture";
- @Override
+ /*@Override
protected void setUp() {
-// addRule(RULESET, "simpletest");
- }
+ addRule(RULESET, "ViewComponentReferencedInModelRule");
+ }*/
+
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/pmd-flex/src/test/resources/org/apache/flex/pmd/rule/xml/ViewComponentReferencedInModelRule.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/pmd-flex/src/test/resources/org/apache/flex/pmd/rule/xml/ViewComponentReferencedInModelRule.xml b/FlexPMD/language-module/pmd-flex/src/test/resources/org/apache/flex/pmd/rule/xml/ViewComponentReferencedInModelRule.xml
new file mode 100644
index 0000000..e18e0d0
--- /dev/null
+++ b/FlexPMD/language-module/pmd-flex/src/test/resources/org/apache/flex/pmd/rule/xml/ViewComponentReferencedInModelRule.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test-data>
+ <code-fragment id="basic-violation">
+ <![CDATA[
+public class Foo {
+ public void example() {
+ int x = 0;
+ int a = 0;
+ int b = 0;
+ int c = 0;
+ int d = 0;
+ int a1 = 0;
+ int a2 = 0;
+ int b1 = 0;
+ int b2 = 0;
+ int z = 0;
+ int h = 0;
+ int e = 0;
+ int f = 0;
+
+ if (a == b) {
+ if (a1 == b1) {
+ x = 2;
+ } else if (a2 == b2) {
+ x = 2;
+ } else {
+ x = 2;
+ }
+ } else if (c == d) {
+ while (c == d) {
+ x = 2;
+ }
+ } else if (e == f) {
+ for (int n = 0; n < h; n++) {
+ x = 2;
+ }
+ } else {
+ switch (z) {
+ case 1:
+ x = 2;
+ break;
+
+ case 2:
+ x = 2;
+ break;
+
+ case 3:
+ x = 2;
+ break;
+
+ default:
+ x = 2;
+ break;
+ }
+ }
+ }
+}
+ ]]>
+ </code-fragment>
+
+ <test-code>
+ <description>Simple method</description>
+ <!--rule-property name="reportLevel">1</rule-property-->
+ <expected-problems>2</expected-problems>
+ <expected-messages>
+ <message>The class 'Foo' has a Cyclomatic Complexity of 2 (Highest = 1).</message>
+ <message>The method 'foo' has a Cyclomatic Complexity of 1.</message>
+ </expected-messages>
+ <code><![CDATA[
+public class Foo {
+ public void foo() {}
+}
+ ]]></code>
+ </test-code>
+ <test-code>
+ <description>testLessComplicatedThanReportLevel</description>
+ <!--rule-property name="reportLevel">10</rule-property-->
+ <expected-problems>0</expected-problems>
+ <code><![CDATA[
+public class Foo {
+ public void foo() {}
+}
+ ]]></code>
+ </test-code>
+ <test-code>
+ <description>Complicated method</description>
+ <!--rule-property name="reportLevel">10</rule-property-->
+ <expected-problems>2</expected-problems>
+ <expected-messages>
+ <message>The class 'Foo' has a Cyclomatic Complexity of 12 (Highest = 11).</message>
+ <message>The method 'example' has a Cyclomatic Complexity of 11.</message>
+ </expected-messages>
+ <code-ref id="basic-violation"/>
+ </test-code>
+ <test-code>
+ <description>Constructor</description>
+ <!--rule-property name="reportLevel">1</rule-property-->
+ <expected-problems>2</expected-problems>
+ <expected-messages>
+ <message>The class 'Foo' has a Cyclomatic Complexity of 2 (Highest = 1).</message>
+ <message>The constructor 'Foo' has a Cyclomatic Complexity of 1.</message>
+ </expected-messages>
+ <code><![CDATA[
+public class Foo {
+ public Foo() {}
+}
+ ]]></code>
+ </test-code>
+ <test-code>
+ <description>
+ <![CDATA[
+Testing new parameter showClassMethods
+ ]]>
+ </description>
+ <rule-property name="showClassesComplexity">false</rule-property>
+ <expected-problems>1</expected-problems>
+ <code-ref id="basic-violation"/>
+ </test-code>
+ <test-code>
+ <description>
+ <![CDATA[
+Testing new parameter showMethodsMethods
+ ]]>
+ </description>
+ <rule-property name="showMethodsComplexity">false</rule-property>
+ <expected-problems>1</expected-problems>
+ <code-ref id="basic-violation"/>
+ </test-code>
+ <test-code>
+ <description>
+ <![CDATA[
+Testing default value of showClassMethods and showClassesComplexity
+ ]]>
+ </description>
+ <expected-problems>2</expected-problems>
+ <code-ref id="basic-violation"/>
+ </test-code>
+ <code-fragment id="constructor-violation"><![CDATA[
+public class Test {
+ public Test() {
+ if (a == 1) {
+ if (b == 2) {
+ System.out.println("b");
+ } else if (b == 1) {
+ }
+ } else {
+ }
+ }
+}
+ ]]></code-fragment>
+ <test-code>
+ <description>#984 Cyclomatic complexity should treat constructors like methods: 1 - showMethodsComplexity=true</description>
+ <rule-property name="showClassesComplexity">false</rule-property>
+ <rule-property name="showMethodsComplexity">true</rule-property>
+ <rule-property name="reportLevel">1</rule-property>
+ <expected-problems>1</expected-problems>
+ <code-ref id="constructor-violation"/>
+ </test-code>
+ <test-code>
+ <description>#984 Cyclomatic complexity should treat constructors like methods: 2 - showMethodsComplexity=false</description>
+ <rule-property name="showClassesComplexity">false</rule-property>
+ <rule-property name="showMethodsComplexity">false</rule-property>
+ <rule-property name="reportLevel">1</rule-property>
+ <expected-problems>0</expected-problems>
+ <code-ref id="constructor-violation"/>
+ </test-code>
+ <test-code reinitializeRule="true">
+ <description>#985 Suppressed methods shouldn't affect avg CyclomaticComplexity</description>
+ <rule-property name="reportLevel">2</rule-property>
+ <expected-problems>0</expected-problems>
+ <code><![CDATA[
+public class Test {
+ @SuppressWarnings("PMD.CyclomaticComplexity")
+ public Test() {
+ if (a == 1) {
+ if (b == 2) {
+ System.out.println("b");
+ } else if (b == 1) {
+ }
+ } else {
+ }
+ }
+}
+ ]]></code>
+ </test-code>
+</test-data>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/pmd-flex/src/test/resources/org/apache/flex/pmd/rule/xml/simpletest.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/pmd-flex/src/test/resources/org/apache/flex/pmd/rule/xml/simpletest.xml b/FlexPMD/language-module/pmd-flex/src/test/resources/org/apache/flex/pmd/rule/xml/simpletest.xml
deleted file mode 100644
index 2cf2f0b..0000000
--- a/FlexPMD/language-module/pmd-flex/src/test/resources/org/apache/flex/pmd/rule/xml/simpletest.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-data>
- <code-fragment id="basic-violation">
- <![CDATA[
-public class Foo {
- public void example() {
- int x = 0;
- int a = 0;
- int b = 0;
- int c = 0;
- int d = 0;
- int a1 = 0;
- int a2 = 0;
- int b1 = 0;
- int b2 = 0;
- int z = 0;
- int h = 0;
- int e = 0;
- int f = 0;
-
- if (a == b) {
- if (a1 == b1) {
- x = 2;
- } else if (a2 == b2) {
- x = 2;
- } else {
- x = 2;
- }
- } else if (c == d) {
- while (c == d) {
- x = 2;
- }
- } else if (e == f) {
- for (int n = 0; n < h; n++) {
- x = 2;
- }
- } else {
- switch (z) {
- case 1:
- x = 2;
- break;
-
- case 2:
- x = 2;
- break;
-
- case 3:
- x = 2;
- break;
-
- default:
- x = 2;
- break;
- }
- }
- }
-}
- ]]>
- </code-fragment>
-
- <test-code>
- <description>Simple method</description>
- <rule-property name="reportLevel">1</rule-property>
- <expected-problems>2</expected-problems>
- <expected-messages>
- <message>The class 'Foo' has a Cyclomatic Complexity of 2 (Highest = 1).</message>
- <message>The method 'foo' has a Cyclomatic Complexity of 1.</message>
- </expected-messages>
- <code><![CDATA[
-public class Foo {
- public void foo() {}
-}
- ]]></code>
- </test-code>
- <test-code>
- <description>testLessComplicatedThanReportLevel</description>
- <rule-property name="reportLevel">10</rule-property>
- <expected-problems>0</expected-problems>
- <code><![CDATA[
-public class Foo {
- public void foo() {}
-}
- ]]></code>
- </test-code>
- <test-code>
- <description>Complicated method</description>
- <rule-property name="reportLevel">10</rule-property>
- <expected-problems>2</expected-problems>
- <expected-messages>
- <message>The class 'Foo' has a Cyclomatic Complexity of 12 (Highest = 11).</message>
- <message>The method 'example' has a Cyclomatic Complexity of 11.</message>
- </expected-messages>
- <code-ref id="basic-violation"/>
- </test-code>
- <test-code>
- <description>Constructor</description>
- <rule-property name="reportLevel">1</rule-property>
- <expected-problems>2</expected-problems>
- <expected-messages>
- <message>The class 'Foo' has a Cyclomatic Complexity of 2 (Highest = 1).</message>
- <message>The constructor 'Foo' has a Cyclomatic Complexity of 1.</message>
- </expected-messages>
- <code><![CDATA[
-public class Foo {
- public Foo() {}
-}
- ]]></code>
- </test-code>
- <test-code>
- <description>
- <![CDATA[
-Testing new parameter showClassMethods
- ]]>
- </description>
- <rule-property name="showClassesComplexity">false</rule-property>
- <expected-problems>1</expected-problems>
- <code-ref id="basic-violation"/>
- </test-code>
- <test-code>
- <description>
- <![CDATA[
-Testing new parameter showMethodsMethods
- ]]>
- </description>
- <rule-property name="showMethodsComplexity">false</rule-property>
- <expected-problems>1</expected-problems>
- <code-ref id="basic-violation"/>
- </test-code>
- <test-code>
- <description>
- <![CDATA[
-Testing default value of showClassMethods and showClassesComplexity
- ]]>
- </description>
- <expected-problems>2</expected-problems>
- <code-ref id="basic-violation"/>
- </test-code>
- <code-fragment id="constructor-violation"><![CDATA[
-public class Test {
- public Test() {
- if (a == 1) {
- if (b == 2) {
- System.out.println("b");
- } else if (b == 1) {
- }
- } else {
- }
- }
-}
- ]]></code-fragment>
- <test-code>
- <description>#984 Cyclomatic complexity should treat constructors like methods: 1 - showMethodsComplexity=true</description>
- <rule-property name="showClassesComplexity">false</rule-property>
- <rule-property name="showMethodsComplexity">true</rule-property>
- <rule-property name="reportLevel">1</rule-property>
- <expected-problems>1</expected-problems>
- <code-ref id="constructor-violation"/>
- </test-code>
- <test-code>
- <description>#984 Cyclomatic complexity should treat constructors like methods: 2 - showMethodsComplexity=false</description>
- <rule-property name="showClassesComplexity">false</rule-property>
- <rule-property name="showMethodsComplexity">false</rule-property>
- <rule-property name="reportLevel">1</rule-property>
- <expected-problems>0</expected-problems>
- <code-ref id="constructor-violation"/>
- </test-code>
- <test-code reinitializeRule="true">
- <description>#985 Suppressed methods shouldn't affect avg CyclomaticComplexity</description>
- <rule-property name="reportLevel">2</rule-property>
- <expected-problems>0</expected-problems>
- <code><![CDATA[
-public class Test {
- @SuppressWarnings("PMD.CyclomaticComplexity")
- public Test() {
- if (a == 1) {
- if (b == 2) {
- System.out.println("b");
- } else if (b == 1) {
- }
- } else {
- }
- }
-}
- ]]></code>
- </test-code>
-</test-data>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/pom.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/pom.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/pom.xml
index b60a384..330d387 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/pom.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/pom.xml
@@ -45,9 +45,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.8</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/architecture.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/architecture.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/architecture.xml
index 2b7776b..3cc0157 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/architecture.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/architecture.xml
@@ -27,9 +27,10 @@
The Architecture ruleset contains a collection of good practices around architecture.
</description>
- <rule class="com.adobe.ac.pmd.rules.architecture.ViewComponentReferencedInModelRule"
- message="A view component should not be referenced in a model class"
- language="flex">
+ <rule name="ViewComponentReferencedInModelRule"
+ class="org.apache.flex.pmd.rules.architecture.ViewComponentReferencedInModelRule"
+ message="A view component should not be referenced in a model class"
+ language="flex">
<description></description>
<priority>3</priority>
<example>
@@ -44,14 +45,18 @@ package com.adobe.ac
</example>
</rule>
- <rule class="org.apache.flex.pmd.rules.architecture.MonkeyPatchingRule"
- message="This class looks to be duplicated with a SDK class">
+ <rule name="MonkeyPatchingRule"
+ class="org.apache.flex.pmd.rules.architecture.MonkeyPatchingRule"
+ message="This class looks to be duplicated with a SDK class"
+ language="flex">
<description>Monkey patching can be a risky undertaking because it is not using intended extensibility points and thus may have unintended consequences or make migration to newer versions of the SDK more difficult</description>
<priority>1</priority>
</rule>
- <rule class="com.adobe.ac.pmd.rules.architecture.UseInternalClassOutsideApiClass"
- message="This class imports an internal class ({0}) from another function area ({1})">
+ <rule name="UseInternalClassOutsideApiClass"
+ class="org.apache.flex.pmd.rules.architecture.UseInternalClassOutsideApiClass"
+ message="This class imports an internal class ({0}) from another function area ({1})"
+ language="flex">
<description>If you have different functionalities, you probably don't want every class of each to be accessible from any other functional areas.
So you probably want to use this packaging:
[org].[project].func1.api
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/asdocs.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/asdocs.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/asdocs.xml
index fca2dee..ebb4e4b 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/asdocs.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/asdocs.xml
@@ -29,19 +29,19 @@
</description>
<rule
- class="com.adobe.ac.pmd.rules.asdocs.AttributeAsDocMissingRule"
+ class="org.apache.flex.pmd.rules.asdocs.AttributeAsDocMissingRule"
message="This attribute ({0}) should be documented with AsDocs.">
<priority>3</priority>
</rule>
<rule
- class="com.adobe.ac.pmd.rules.asdocs.ClassAsDocMissingRule"
+ class="org.apache.flex.pmd.rules.asdocs.ClassAsDocMissingRule"
message="This class ({0}) should be documented with AsDocs.">
<priority>3</priority>
</rule>
<rule
- class="com.adobe.ac.pmd.rules.asdocs.MethodAsDocMissingRule"
+ class="org.apache.flex.pmd.rules.asdocs.MethodAsDocMissingRule"
message="This method ({0}) should be documented with AsDocs.">
<priority>3</priority>
</rule>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/basic_mxml.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/basic_mxml.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/basic_mxml.xml
index 1378fc7..0b7e643 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/basic_mxml.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/basic_mxml.xml
@@ -27,17 +27,17 @@
The Basic MXML Ruleset contains a collection of good practices which everyone should follow.
</description>
- <rule class="com.adobe.ac.pmd.rules.mxml.MoreThanOneEntryPointInMxmlRule"
+ <rule class="org.apache.flex.pmd.rules.mxml.MoreThanOneEntryPointInMxmlRule"
message="There is more than 1 public variable in this MXML component">
<priority>5</priority>
</rule>
- <rule class="com.adobe.ac.pmd.rules.mxml.MoreThanTwoEntryPointsInMxmlRule"
+ <rule class="org.apache.flex.pmd.rules.mxml.MoreThanTwoEntryPointsInMxmlRule"
message="There are more than 2 public variables in this MXML component">
<priority>3</priority>
</rule>
- <rule class="com.adobe.ac.pmd.rules.mxml.TooLongScriptBlockRule"
+ <rule class="org.apache.flex.pmd.rules.mxml.TooLongScriptBlockRule"
message="This script block is too long ({0} maximum, but {1} actually)">
<priority>3</priority>
<properties>
@@ -47,13 +47,13 @@
</properties>
</rule>
- <rule class="com.adobe.ac.pmd.rules.mxml.CodeBehindInMxmlRule"
+ <rule class="org.apache.flex.pmd.rules.mxml.CodeBehindInMxmlRule"
message="Avoid using code behind files">
<description>Code behind files are tightly coupled with the view, not unit-testable, not easy to navigate the code code base and not reusable. Try using presentation model pattern, or observer pattern</description>
<priority>5</priority>
</rule>
- <rule class="com.adobe.ac.pmd.rules.mxml.TooManyStatesInMxmlRule"
+ <rule class="org.apache.flex.pmd.rules.mxml.TooManyStatesInMxmlRule"
message="Having too many states does not help visibility. Try to refactor this view component.">
<priority>3</priority>
<properties>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/binding.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/binding.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/binding.xml
index a2c2b43..d617724 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/binding.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/binding.xml
@@ -27,7 +27,7 @@
The Binding ruleset contains a collection of good practices around usage of binding.
</description>
- <rule class="com.adobe.ac.pmd.rules.binding.BindingUtilsRule"
+ <rule class="org.apache.flex.pmd.rules.binding.BindingUtilsRule"
message="BindingUtils class uses hard coded strings, which won't be picked up by the compiler if you rename this attribute. You should probably consider refactoring using events">
<description></description>
<priority>1</priority>
@@ -42,7 +42,7 @@ public class Controller extends FrontController
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.binding.ChangeWatcherRule"
+ <rule class="org.apache.flex.pmd.rules.binding.ChangeWatcherRule"
message="ChangeWatcher class uses hard coded strings to specify the attribute name, to listen to. Prefer listening to events or setters">
<priority>1</priority>
<example>
@@ -53,7 +53,7 @@ public final class Title
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.binding.TooLongBindingExpressionRule"
+ <rule class="org.apache.flex.pmd.rules.binding.TooLongBindingExpressionRule"
message="This binding expression is too long ({0} dots maximum, but {1} actually)">
<description>A Binding expression is executed as soon as one of the bindable attributes changed. If a binding expression contains too many expression, there could be some performance issue.</description>
<priority>3</priority>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/cairngorm.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/cairngorm.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/cairngorm.xml
index 6083ba0..0353fb7 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/cairngorm.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/cairngorm.xml
@@ -26,7 +26,7 @@
The Cairngorm Ruleset contains a collection of good practices related to Cairngorm.
</description>
- <rule class="com.adobe.ac.pmd.rules.cairngorm.BindableModelLocatorRule"
+ <rule class="org.apache.flex.pmd.rules.cairngorm.BindableModelLocatorRule"
message="A modelLocator must not be Bindable at a class level">
<description>A bindable ModelLocator could leads to performance issues due to bindings</description>
<priority>1</priority>
@@ -39,7 +39,7 @@ public class BindableModelLocator // VIOLATION
</rule>
<rule
- class="com.adobe.ac.pmd.rules.cairngorm.ReferenceModelLocatorOutsideTheMainApplicationRule"
+ class="org.apache.flex.pmd.rules.cairngorm.ReferenceModelLocatorOutsideTheMainApplicationRule"
message="The ModelLocator should be only accessible from the main application file">
<description>The ModelLocator should be only accessible from the main application file. Then sub-models should be injected to the nested views.</description>
<priority>3</priority>
@@ -55,7 +55,7 @@ package business
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.cairngorm.FatControllerRule"
+ <rule class="org.apache.flex.pmd.rules.cairngorm.FatControllerRule"
message="A FrontController must nor add all its commands within the Controller constructor">
<description>Try split them into methods where you add commands depending on their functional area.</description>
<priority>3</priority>
@@ -88,7 +88,7 @@ package control
</rule>
<rule
- class="com.adobe.ac.pmd.rules.cairngorm.BadCairngormEventNameFormatRule"
+ class="org.apache.flex.pmd.rules.cairngorm.BadCairngormEventNameFormatRule"
message="A Cairngorm event name should contain the function area name before the actual event name">
<description>You would have something like 'productManagement.getProducts' as an event name.</description>
<priority>3</priority>
@@ -113,7 +113,7 @@ public class UncorrectConstantEvent extends CairngormEnterpriseEvent
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.cairngorm.CairngormEventDispatcherCallExplicitlyRule"
+ <rule class="org.apache.flex.pmd.rules.cairngorm.CairngormEventDispatcherCallExplicitlyRule"
message="CairngormEventDispatcher is called explicitly. {0}">
<priority>3</priority>
<example>
@@ -127,7 +127,7 @@ public function foo() : void
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.cairngorm.ModelLocatorReferencedMoreThanOncePerClassRule"
+ <rule class="org.apache.flex.pmd.rules.cairngorm.ModelLocatorReferencedMoreThanOncePerClassRule"
message="Only one reference of ModelLocator is allowed per class">
<priority>3</priority>
</rule>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/component.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/component.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/component.xml
index b851ac5..b2928f6 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/component.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/component.xml
@@ -28,14 +28,14 @@
</description>
<rule
- class="com.adobe.ac.pmd.rules.component.UpdateChildrenNumberInUpdateDisplayListRule"
+ class="org.apache.flex.pmd.rules.component.UpdateChildrenNumberInUpdateDisplayListRule"
message="Flex specific - Do not add or remove displayable children from updateDisplayList">
<description>UpdateDisplayList is called everytime a child is invalidated. So calling addChild or removeChild in this function could be really CPU consuming</description>
<priority>1</priority>
<example></example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.component.CallLaterDirectlyRule"
+ <rule class="org.apache.flex.pmd.rules.component.CallLaterDirectlyRule"
message="Flex specific - Don't call 'callLater' explicitly">
<description>If you needed to call 'callLater' explicitly, then you probably did not extend the correct component life cycle.</description>
<priority>1</priority>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/css.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/css.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/css.xml
index 89d8597..abbf837 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/css.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/css.xml
@@ -28,13 +28,13 @@
styling.
</description>
- <rule class="com.adobe.ac.pmd.rules.css.StyleBlockInMxmlRule"
+ <rule class="org.apache.flex.pmd.rules.css.StyleBlockInMxmlRule"
message="The style block is embed in the MXML file">
<description>It is not a good practice to embed style blocks inside the MXML component. Prefer using external CSS files.</description>
<priority>3</priority>
</rule>
- <rule class="com.adobe.ac.pmd.rules.css.UseCssInsteadOfEmbedMetaDataRule"
+ <rule class="org.apache.flex.pmd.rules.css.UseCssInsteadOfEmbedMetaDataRule"
message="Embed metadata detected in source code where a stylesheet may be cleaner">
<priority>5</priority>
</rule>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/empty.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/empty.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/empty.xml
index f747c0d..de15067 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/empty.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/empty.xml
@@ -27,7 +27,7 @@
The Empty ruleset contains a collection of rules detecting empty statements.
</description>
- <rule class="com.adobe.ac.pmd.rules.empty.EmptyCatchStatementRule"
+ <rule class="org.apache.flex.pmd.rules.empty.EmptyCatchStatementRule"
message="This catch statement is empty">
<priority>3</priority>
<example>
@@ -46,7 +46,7 @@ public class Foo
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.empty.EmptyIfStmtRule"
+ <rule class="org.apache.flex.pmd.rules.empty.EmptyIfStmtRule"
message="No statements in this if statement">
<description>Empty If Statement finds instances where a condition is checked but nothing is done about it. </description>
<priority>3</priority>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/event.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/event.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/event.xml
index 6213052..a1f1191 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/event.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/event.xml
@@ -27,7 +27,7 @@
The Event ruleset contains a collection of rules related to event bad practices.
</description>
- <rule class="com.adobe.ac.pmd.rules.event.EventMissingCloneFunctionRule"
+ <rule class="org.apache.flex.pmd.rules.event.EventMissingCloneFunctionRule"
message="The clone event must be overiden in a custom event">
<description>When creating your own custom Event class, you must override the inherited Event.clone() method in order for it to duplicate the properties of your custom class. If you do not set all the properties that you add in your event subclass, those properties will not have the correct values when the event is cloned. This is important because the Flex SDK clones events whenever redispatching takes place. </description>
<priority>1</priority>
@@ -44,7 +44,7 @@ public class FirstCustomEvent // VIOLATION - clone method is missing
</rule>
<rule
- class="com.adobe.ac.pmd.rules.event.PublicVariableInCustomEventRule"
+ class="org.apache.flex.pmd.rules.event.PublicVariableInCustomEventRule"
message="No public variables should be inside a custom event. This variable ({0}) is public">
<description>In order to improve encapsulation in your custom event, it is better not to have public variable in your event. Prefer having read-only attributes, set by the event constructor.</description>
<priority>3</priority>
@@ -61,7 +61,7 @@ public class FirstCustomEvent
</rule>
<rule
- class="com.adobe.ac.pmd.rules.event.ConstructorDispatchingEventRule"
+ class="org.apache.flex.pmd.rules.event.ConstructorDispatchingEventRule"
message="An event is dispatched in a constructor">
<description>This is pointless, since event listeners cannot be attached to an object before it has been constructed, so nothing can ever hear the event</description>
<priority>1</priority>
@@ -75,7 +75,7 @@ public class BigModel
}
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.event.DefaultEventNameRule"
+ <rule class="org.apache.flex.pmd.rules.event.DefaultEventNameRule"
message="Event name should be set explicitly">
<priority>3</priority>
<example>
@@ -89,7 +89,7 @@ public class DefaultNameEvent extends Event
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.event.DispatchHardCodedEventNameRule"
+ <rule class="org.apache.flex.pmd.rules.event.DispatchHardCodedEventNameRule"
message="DispatchEvent function must dispatch constant strings">
<description>You should not dispatch a plain string. If you rename this string, you need to replace the string listener as well. Use constants instead</description>
<priority>1</priority>
@@ -105,7 +105,7 @@ public class Foo
</rule>
<rule
- class="com.adobe.ac.pmd.rules.event.ListenForHardCodedEventNameRule"
+ class="org.apache.flex.pmd.rules.event.ListenForHardCodedEventNameRule"
message="addEventListener must not contain hard coded strings">
<description>You should not listen for a plain string. If you rename this string, you need to replace the string listener as well. Use constants instead</description>
<priority>1</priority>
@@ -121,7 +121,7 @@ public class Foo
</rule>
<rule
- class="com.adobe.ac.pmd.rules.event.UnboundTypeInMetadataRule"
+ class="org.apache.flex.pmd.rules.event.UnboundTypeInMetadataRule"
message="This type ({0}) was not found within the scope against which PMD was run">
<priority>1</priority>
<example>
@@ -133,7 +133,7 @@ public class UnboundMetadata
</rule>
<rule
- class="com.adobe.ac.pmd.rules.event.UntypedEventMetadataRule"
+ class="org.apache.flex.pmd.rules.event.UntypedEventMetadataRule"
message="This event type is not specified">
<description>Specifying a type will allow Flash builder and the class to have this event exposed in its API</description>
<priority>3</priority>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/flexunit.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/flexunit.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/flexunit.xml
index 9649ceb..0c7eee9 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/flexunit.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/flexunit.xml
@@ -27,7 +27,7 @@
The FlexUnit Ruleset contains a collection of good practices related to FlexUnit (1 and 4).
</description>
- <rule class="com.adobe.ac.pmd.rules.flexunit.EmptyUnitTest"
+ <rule class="org.apache.flex.pmd.rules.flexunit.EmptyUnitTest"
message="A test should contain at least one assertion">
<priority>3</priority>
</rule>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/indentation.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/indentation.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/indentation.xml
index 0ca4684..6df1f62 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/indentation.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/indentation.xml
@@ -25,7 +25,7 @@
<description/>
- <rule class="com.adobe.ac.pmd.rules.style.TabUsedAsIndentorRule" message="Tabulations are not accepted for indentation. Please use spaces instead.">
+ <rule class="org.apache.flex.pmd.rules.style.TabUsedAsIndentorRule" message="Tabulations are not accepted for indentation. Please use spaces instead.">
<priority>3</priority>
</rule>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/maintanability.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/maintanability.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/maintanability.xml
index 6f7ca5c..605edec 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/maintanability.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/maintanability.xml
@@ -27,16 +27,16 @@
The Maintanability ruleset contains a collection of good practices around Maintanability.
</description>
- <rule since="1.1" class="com.adobe.ac.pmd.rules.maintanability.OnlyOneReturnRule" message="A method should have only one exit point, and that should be the last statement in the method">
+ <rule since="1.1" class="org.apache.flex.pmd.rules.maintanability.OnlyOneReturnRule" message="A method should have only one exit point, and that should be the last statement in the method">
<priority>3</priority>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.AlertShowRule" message="Do not call Alert.show directly">
+ <rule class="org.apache.flex.pmd.rules.maintanability.AlertShowRule" message="Do not call Alert.show directly">
<description>You should not Alert.show() directly. If an error occurred in the system, you should probably use an ErrorManager to have a consistent way to manage those errors.</description>
<priority>1</priority>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.ExcessiveImportRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.ExcessiveImportRule"
message="A high number of imports can indicate a high degree of coupling within an object. ({0} maximum but {1} actually)">
<description>A high number of imports can indicate a high degree of coupling within an object. Rule counts the number of unique imports and reports a violation if the count is above the user defined threshold.</description>
<priority>3</priority>
@@ -58,7 +58,7 @@ public class Foo
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.TrueFalseConditionRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.TrueFalseConditionRule"
message="This test contains a hard coded boolean value. You could remove it by having '{0}'">
<priority>3</priority>
<example>
@@ -71,12 +71,12 @@ if ( true ) // VIOLATION
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.AvoidUsingPublicStaticFieldRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.AvoidUsingPublicStaticFieldRule"
message="If this field ({0}) was meant to be a constant, make it constant. Otherwise, if it is used as a global variable, you may want to redesign this class">
<priority>3</priority>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.DynamicClassRule" message="A class must not be dynamic">
+ <rule class="org.apache.flex.pmd.rules.maintanability.DynamicClassRule" message="A class must not be dynamic">
<description>When using dynamic classes, you cannot control how the developer will use your class. It makes refactoring really difficult</description>
<priority>1</priority>
<example>
@@ -86,7 +86,7 @@ dynamic public class DynamicObject // VIOLATION
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.forbiddentypes.UseObjectTypeRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.forbiddentypes.UseObjectTypeRule"
message="Do not use Object class">
<description>It is a bad practice to use the dynamic class Object. Prefer using strongly typed object, or marker interface in order to avoid silent compilation errors while refactoring</description>
<priority>1</priority>
@@ -98,7 +98,7 @@ public class Foo
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.forbiddentypes.UseDictionaryTypeRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.forbiddentypes.UseDictionaryTypeRule"
message="Do not use Dictionnary class">
<description>It is a bad practice to use the dynamic class Dictionary. Prefer using strongly typed object, or marker interface in order to avoid silent compilation errors while refactoring</description>
<priority>1</priority>
@@ -110,7 +110,7 @@ public class Foo
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.NonStaticConstantFieldRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.NonStaticConstantFieldRule"
message="A constant field should be static ({0})">
<description>
</description>
@@ -123,7 +123,7 @@ public class MyObject {
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.forbiddentypes.UseGenericTypeRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.forbiddentypes.UseGenericTypeRule"
message="Use strongly typed objects instead of *">
<description></description>
<priority>1</priority>
@@ -135,7 +135,7 @@ public class Foo
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.UselessOverridenFunctionRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.UselessOverridenFunctionRule"
message="This method is empty. This should be removed ({0})">
<description>This function is not needed.</description>
<priority>3</priority>
@@ -147,7 +147,7 @@ override protected function createChildren() : void
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.AvoidProtectedFieldInFinalClassRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.AvoidProtectedFieldInFinalClassRule"
message="Protected accessors are useless in a final class. Make it private ({0})">
<priority>3</priority>
<example>
@@ -158,12 +158,12 @@ final public class Foo
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.AvoidUsingWithKeyWordRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.AvoidUsingWithKeyWordRule"
message="You should not use the with keyword. It does not help readability">
<priority>3</priority>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.ArrayFieldWithNoArrayElementTypeRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.ArrayFieldWithNoArrayElementTypeRule"
message="ArrayElementType metadata is not specified for this array-type field ({0})">
<description>
</description>
@@ -178,7 +178,7 @@ public class ArrayVO {
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.ClassAndExtensionAreIdenticalRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.ClassAndExtensionAreIdenticalRule"
message="The extension name is the same as the class name">
<description/>
<priority>3</priority>
@@ -192,7 +192,7 @@ package com.MyCompany
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.ProtectedStaticMethodRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.ProtectedStaticMethodRule"
message="This method ({0}) should be private">
<description/>
<priority>3</priority>
@@ -203,7 +203,7 @@ protected static function foo() : void // VIOLATION
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.EmptyStatementRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.EmptyStatementRule"
message="This statement is empty">
<description/>
<priority>5</priority>
@@ -217,7 +217,7 @@ protected function foo() : void
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.ReferenceToVariableBindingFromItsInitializerRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.ReferenceToVariableBindingFromItsInitializerRule"
message="The initializer refers to its variable. Its value will be null.">
<priority>1</priority>
<example>
@@ -230,7 +230,7 @@ package
}
</example>
</rule>
- <rule class="com.adobe.ac.pmd.rules.maintanability.AvoidUseOfAsKeywordRule"
+ <rule class="org.apache.flex.pmd.rules.maintanability.AvoidUseOfAsKeywordRule"
message="Enforce that as is not used (silently ignores the cast and nulls the property when the type is wrong)">
<priority>5</priority>
</rule>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/526c1e73/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/multitouch.xml
----------------------------------------------------------------------
diff --git a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/multitouch.xml b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/multitouch.xml
index c1a82dd..a43894e 100644
--- a/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/multitouch.xml
+++ b/FlexPMD/language-module/ruleset/ruleset-flex-basic/src/main/resources/rulesets/flex/multitouch.xml
@@ -27,12 +27,12 @@
The MultiTouch ruleset contains a collection of good practices when developping multitouch applications.
</description>
- <rule since="1.2" class="com.adobe.ac.pmd.rules.multiscreen.AvoidRollMouseEventRule"
+ <rule since="1.2" class="org.apache.flex.pmd.rules.multiscreen.AvoidRollMouseEventRule"
message="Roll mouse events are not getting caught by a multi-touch device.">
<priority>1</priority>
</rule>
- <rule since="1.2" class="com.adobe.ac.pmd.rules.multiscreen.AvoidTooltipRule"
+ <rule since="1.2" class="org.apache.flex.pmd.rules.multiscreen.AvoidTooltipRule"
message="Tooltip cannot be visible on a multi-touch device.">
<priority>1</priority>
</rule>