#469 fixed

cflint · Dec 24, 2017 · 533200d · 533200d
1 parent 458deaf
commit 533200d
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 2 deletions.
diff --git a/src/main/java/com/cflint/CFLint.java b/src/main/java/com/cflint/CFLint.java
@@ -408,7 +408,7 @@ private void process(final Element elem, final String space, final Context conte
             if (elem.getName().equalsIgnoreCase(CF.CFCOMPONENT)) {
                 final Context componentContext = context.subContext(elem);
                 componentContext.setInComponent(true);
-                componentContext.setComponentName(elem.getAttributeValue(CF.DISPLAYNAME));
+                componentContext.setComponentName(context.getFilename().replaceAll(".[cC][fF][cC]", "").replaceAll("^.*[/\\\\]", ""));//elem.getAttributeValue(CF.DISPLAYNAME)
                 componentContext.setContextType(ContextType.COMPONENT);
                 handler.push(CF.COMPONENT);
                 doStructureStart(elem, componentContext, CFCompDeclStatement.class);
@@ -521,7 +521,7 @@ private void process(final Element elem, final String space, final Context conte
             } else if (elem.getName().equalsIgnoreCase(CF.CFCOMPONENT)) {
                 final Context componentContext = context.subContext(elem);
                 componentContext.setInComponent(true);
-                componentContext.setComponentName(elem.getAttributeValue(CF.DISPLAYNAME));
+                componentContext.setComponentName(context.getFilename().replaceAll(".[cC][fF][cC]", "").replaceAll("^.*[/\\\\]", ""));//elem.getAttributeValue(CF.DISPLAYNAME)
                 componentContext.setContextType(ContextType.COMPONENT);
 
                 scanElement(elem, componentContext);

diff --git a/src/test/resources/com/cflint/tests/ComponentNameChecker/veryLongComponentName.cfc b/src/test/resources/com/cflint/tests/ComponentNameChecker/veryLongComponentName.cfc
@@ -0,0 +1,4 @@
+<cfcomponent hint="test" displayName="TestComp">
+ <cffunction name="testFunction" displayname="" access="public" output="false" returntype="void" hint="no close tag">
+ </cffunction>
+</cfcomponent>
diff --git a/src/test/resources/com/cflint/tests/ComponentNameChecker/veryLongComponentName.expected.txt b/src/test/resources/com/cflint/tests/ComponentNameChecker/veryLongComponentName.expected.txt
@@ -0,0 +1,71 @@
+{
+  "version" : "",
+  "timestamp" : 1514084382,
+  "issues" : [ {
+    "severity" : "INFO",
+    "id" : "COMPONENT_INVALID_NAME",
+    "message" : "COMPONENT_INVALID_NAME",
+    "category" : "CFLINT",
+    "abbrev" : "CI",
+    "locations" : [ {
+      "file" : "src\\test\\resources\\com\\cflint\\tests\\ComponentNameChecker\\veryLongComponentName.cfc",
+      "fileName" : "veryLongComponentName.cfc",
+      "function" : "",
+      "column" : 0,
+      "line" : 1,
+      "message" : "Component name veryLongComponentName is not a valid name. Please use CamelCase and start with a capital letter.",
+      "variable" : "",
+      "expression" : "<cfcomponent hint=\"test\" displayName=\"TestComp\">\r\n <cffunction name=\"testFunction\" displayname=\"\" access=\"public\" output=\"false\" returntype=\"void\" hint=\"no close tag\">\r\n </cffunction>\r\n</cfcomponent>"
+    } ]
+  }, {
+    "severity" : "INFO",
+    "id" : "COMPONENT_TOO_LONG",
+    "message" : "COMPONENT_TOO_LONG",
+    "category" : "CFLINT",
+    "abbrev" : "CT",
+    "locations" : [ {
+      "file" : "src\\test\\resources\\com\\cflint\\tests\\ComponentNameChecker\\veryLongComponentName.cfc",
+      "fileName" : "veryLongComponentName.cfc",
+      "function" : "",
+      "column" : 0,
+      "line" : 1,
+      "message" : "Component name veryLongComponentName should be shorter than 15 characters.",
+      "variable" : "",
+      "expression" : "<cfcomponent hint=\"test\" displayName=\"TestComp\">\r\n <cffunction name=\"testFunction\" displayname=\"\" access=\"public\" output=\"false\" returntype=\"void\" hint=\"no close tag\">\r\n </cffunction>\r\n</cfcomponent>"
+    } ]
+  }, {
+    "severity" : "INFO",
+    "id" : "COMPONENT_TOO_WORDY",
+    "message" : "COMPONENT_TOO_WORDY",
+    "category" : "CFLINT",
+    "abbrev" : "CT",
+    "locations" : [ {
+      "file" : "src\\test\\resources\\com\\cflint\\tests\\ComponentNameChecker\\veryLongComponentName.cfc",
+      "fileName" : "veryLongComponentName.cfc",
+      "function" : "",
+      "column" : 0,
+      "line" : 1,
+      "message" : "Component name veryLongComponentName is too wordy, can you think of a more concise name?",
+      "variable" : "",
+      "expression" : "<cfcomponent hint=\"test\" displayName=\"TestComp\">\r\n <cffunction name=\"testFunction\" displayname=\"\" access=\"public\" output=\"false\" returntype=\"void\" hint=\"no close tag\">\r\n </cffunction>\r\n</cfcomponent>"
+    } ]
+  } ],
+  "counts" : {
+    "totalFiles" : 0,
+    "totalLines" : 0,
+    "countByCode" : [ {
+      "code" : "COMPONENT_INVALID_NAME",
+      "count" : 1
+    }, {
+      "code" : "COMPONENT_TOO_WORDY",
+      "count" : 1
+    }, {
+      "code" : "COMPONENT_TOO_LONG",
+      "count" : 1
+    } ],
+    "countBySeverity" : [ {
+      "severity" : "INFO",
+      "count" : 3
+    } ]
+  }
+}