Better Constant name

albfernandez · Jan 16, 2025 · e06f133 · e06f133
1 parent dd0069b
commit e06f133
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 28 deletions.
diff --git a/src/test/java/com/gdssecurity/pmd/AnnotationInheritanceTest.java b/src/test/java/com/gdssecurity/pmd/AnnotationInheritanceTest.java
@@ -12,7 +12,7 @@ public AnnotationInheritanceTest() {
 
 	@Test
 	public void testAnnotationInheritance () throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationInheritanceClass.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationInheritanceClass.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 }
diff --git a/src/test/java/com/gdssecurity/pmd/AnnotationSinkInConstructorTest.java b/src/test/java/com/gdssecurity/pmd/AnnotationSinkInConstructorTest.java
@@ -12,7 +12,7 @@ public AnnotationSinkInConstructorTest() {
 
 	@Test
 	public void testAnnotationSinkInConstructor() throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/constructor/AnnotationExampleSinkConstructor1.java", PMDRunner.RULESET_ANNOTATIONS));	
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/constructor/AnnotationExampleSinkConstructor1.java", PMDRunner.RULESET_XSS_ANNOTATIONS));	
 	}
 
 }
diff --git a/src/test/java/com/gdssecurity/pmd/AnnotationTest.java b/src/test/java/com/gdssecurity/pmd/AnnotationTest.java
@@ -13,49 +13,49 @@ public AnnotationTest() {
 
 	@Test
 	public void testSinkIsOkStringConcat() throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleSinkConcat.java", PMDRunner.RULESET_ANNOTATIONS));	
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleSinkConcat.java", PMDRunner.RULESET_XSS_ANNOTATIONS));	
 	}
 
 	@Test
 	public void testSinkIsOk () throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationExample.java", PMDRunner.RULESET_ANNOTATIONS));	
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationExample.java", PMDRunner.RULESET_XSS_ANNOTATIONS));	
 	}
 	@Test
 	public void testCallingSinkIsNotOk () throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExample2.java", PMDRunner.RULESET_ANNOTATIONS));	
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExample2.java", PMDRunner.RULESET_XSS_ANNOTATIONS));	
 	}
 
 	@Test
 	public void testCallinkSinkValidateParams() throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParams.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParams.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 	@Test
 	public void testCallinkSinkValidateParamsQualified() throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParamsQualified.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParamsQualified.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 	@Test
 	public void testCallinkSinkValidateParamsStatic() throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParamsStatic.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParamsStatic.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 	@Test
 	public void testCallinkSinkValidateParamsStaticQualified() throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParamsStaticQualified.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParamsStaticQualified.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}	
 	@Test
 	public void testCallinkSinkValidateParamsStaticOtherClass() throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParamsStaticOtherClass.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationExampleValidateParamsStaticOtherClass.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 	@Test
 	public void testComplex() throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationsExampleComplexCall1.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationsExampleComplexCall1.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 	@Test
 	public void testComplex3() throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationsExampleComplexCall3.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/AnnotationsExampleComplexCall3.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 

diff --git a/src/test/java/com/gdssecurity/pmd/AnnotationsGeneratorTest.java b/src/test/java/com/gdssecurity/pmd/AnnotationsGeneratorTest.java
@@ -12,52 +12,52 @@ public AnnotationsGeneratorTest() {
 
 	@Test
 	public void testNoGenerator () throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorExample.java", PMDRunner.RULESET_ANNOTATIONS));	
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorExample.java", PMDRunner.RULESET_XSS_ANNOTATIONS));	
 	}
 	@Test
 	public void testGeneratorOk () throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorOkExample.java", PMDRunner.RULESET_ANNOTATIONS));	
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorOkExample.java", PMDRunner.RULESET_XSS_ANNOTATIONS));	
 	}
 	@Test
 	public void testGeneratorBad () throws Exception {
-		Assertions.assertEquals(2, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorBadExample.java", PMDRunner.RULESET_ANNOTATIONS));	
+		Assertions.assertEquals(2, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorBadExample.java", PMDRunner.RULESET_XSS_ANNOTATIONS));	
 	}
 
 	@Test
 	public void testGeneratorStatic() throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorStatic.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorStatic.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 	@Test
 	public void testGeneratorStaticCaller() throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorStaticCaller.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorStaticCaller.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 	@Test
 	public void testGeneratorPrivateCallOk() throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorPrivateCallOk.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorPrivateCallOk.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 	@Test
 	public void testGeneratorPrivateCallBad() throws Exception {
-		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorPrivateCallBad.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(1, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorPrivateCallBad.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 	@Test
 	public void testGeneratorTwoCallsInOneFile() throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/twocallsonefile/TwoCallsInOneFile.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/twocallsonefile/TwoCallsInOneFile.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 	@Test
 	public void testGeneratorTwoCallsInTwoFiles() throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/twocallstwofiles", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/twocallstwofiles", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 	@Test
 	public void testGeneratorStringBuilder() throws Exception {
-		Assertions.assertEquals(2, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorStringBuilder.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(2, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorStringBuilder.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 
 	@Test
 	public void testGeneratorChainedCall() throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorChainedCall.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/generator/AnnotationsGeneratorChainedCall.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 }
diff --git a/src/test/java/com/gdssecurity/pmd/AttributesTaintedDataTest.java b/src/test/java/com/gdssecurity/pmd/AttributesTaintedDataTest.java
@@ -10,7 +10,7 @@ public class AttributesTaintedDataTest {
 
 	@Test
 	public void attributesAreTaintedDataByDefault () throws Exception {
-		Assertions.assertEquals(3, PMDRunner.run("src/test/java/resources/others/AttributesAreTaintedData.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(3, PMDRunner.run("src/test/java/resources/others/AttributesAreTaintedData.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 	@Test

diff --git a/src/test/java/com/gdssecurity/pmd/PMDRunner.java b/src/test/java/com/gdssecurity/pmd/PMDRunner.java
@@ -15,7 +15,7 @@ public final class PMDRunner {
 	public static final String RULESET_WEAK_CRYPTO = "rulesets/GDS/CWE/cwe-0327-weak-cryptographic-algorithms.xml";
 	public static final String RULESET_UNVALIDATED_REDIRECTS = "rulesets/GDS/CWE/cwe-0601-open-redirect.xml";
 	public static final String RULESET_HTTP_RESPONSE_SPLITTING = "rulesets/GDS/CWE/cwe-0113-http-response-splitting.xml";
-	public static final String RULESET_ANNOTATIONS = "rulesets/xss-annotations.xml";
+	public static final String RULESET_XSS_ANNOTATIONS = "rulesets/xss-annotations.xml";
 
 	private PMDRunner() {
 		throw new AssertionError("No instances allowed");

diff --git a/src/test/java/com/gdssecurity/pmd/ParameterConfussionTest.java b/src/test/java/com/gdssecurity/pmd/ParameterConfussionTest.java
@@ -11,7 +11,7 @@ public ParameterConfussionTest() {
 
 	@Test
 	public void confussion() throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationsParameterConfussion.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationsParameterConfussion.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 }
diff --git a/src/test/java/com/gdssecurity/pmd/SkinCallSinkTest.java b/src/test/java/com/gdssecurity/pmd/SkinCallSinkTest.java
@@ -12,6 +12,6 @@ public SkinCallSinkTest() {
 
 	@Test
 	public void testCallSink () throws Exception {
-		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationsSinkCallSink.java", PMDRunner.RULESET_ANNOTATIONS));
+		Assertions.assertEquals(0, PMDRunner.run("src/test/java/resources/annotations/AnnotationsSinkCallSink.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 }
diff --git a/src/test/java/com/gdssecurity/pmd/UsingRequestAsParameterTest.java b/src/test/java/com/gdssecurity/pmd/UsingRequestAsParameterTest.java
@@ -17,7 +17,7 @@ public void testUsingRequestAsParameter () throws Exception {
 	@Test
 	public void testUsingRequestAsParameterFixed () throws Exception {
 		Assertions.assertEquals(0, PMDRunner.run(
-				"src/test/java/resources/others/bug71/UsingRequestAsParameterFixedExample.java", PMDRunner.RULESET_ANNOTATIONS));
+				"src/test/java/resources/others/bug71/UsingRequestAsParameterFixedExample.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
 	}
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ public class AttributesTaintedDataTest { @@
     	@Test
     	public void attributesAreTaintedDataByDefault () throws Exception {
-    		Assertions.assertEquals(3, PMDRunner.run("src/test/java/resources/others/AttributesAreTaintedData.java", PMDRunner.RULESET_ANNOTATIONS));
+    		Assertions.assertEquals(3, PMDRunner.run("src/test/java/resources/others/AttributesAreTaintedData.java", PMDRunner.RULESET_XSS_ANNOTATIONS));
     	}
     	@Test
@@ Expand Down @@