Fix #85 column-count check fails at 'auto'

racodond · racodond · commit 06e50834c8b1 · 2018-02-14T18:40:32.000+01:00
diff --git a/css-checks/src/test/resources/checks/common/properties/css/column-count.css b/css-checks/src/test/resources/checks/common/properties/css/column-count.css
@@ -1,8 +1,9 @@
 .mybox {
   column-count: inherit;
+  column-count: auto;
   column-count: 0;
   column-count: 10;
-  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: <integer>(>=0)}! */
+  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: auto | <integer>(>=0)}! */
   column-count: none; /* Noncompliant */
   column-count: -10; /* Noncompliant */
 }
diff --git a/css-checks/src/test/resources/checks/common/properties/less/column-count.less b/css-checks/src/test/resources/checks/common/properties/less/column-count.less
@@ -1,8 +1,9 @@
 .mybox {
   column-count: inherit;
+  column-count: auto;
   column-count: 0;
   column-count: 10;
-  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: <integer>(>=0)}! */
+  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: auto | <integer>(>=0)}! */
   column-count: none; /* Noncompliant */
   column-count: -10; /* Noncompliant */
 }
diff --git a/css-checks/src/test/resources/checks/common/properties/scss/column-count.scss b/css-checks/src/test/resources/checks/common/properties/scss/column-count.scss
@@ -1,8 +1,9 @@
 .mybox {
   column-count: inherit;
+  column-count: auto;
   column-count: 0;
   column-count: 10;
-  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: <integer>(>=0)}! */
+  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: auto | <integer>(>=0)}! */
   column-count: none; /* Noncompliant */
   column-count: -10; /* Noncompliant */
 }
diff --git a/css-frontend/src/main/java/org/sonar/css/model/property/standard/ColumnCount.java b/css-frontend/src/main/java/org/sonar/css/model/property/standard/ColumnCount.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.css.model.property.standard;
 
-import org.sonar.css.model.Vendor;
 import org.sonar.css.model.property.StandardProperty;
 import org.sonar.css.model.property.validator.ValidatorFactory;
 
@@ -30,8 +29,7 @@ public ColumnCount() {
     addLinks(
       "http://dev.w3.org/csswg/css-multicol-1/#propdef-column-count",
       "https://developer.mozilla.org/en-US/docs/Web/CSS/column-count");
-    addVendors(Vendor.MOZILLA);
-    addValidators(ValidatorFactory.getPositiveIntegerValidator());
+    addValidators(ValidatorFactory.getAutoValidator(), ValidatorFactory.getPositiveIntegerValidator());
   }
 
 }
diff --git a/css-frontend/src/test/java/org/sonar/css/model/property/StandardPropertyFactoryTest.java b/css-frontend/src/test/java/org/sonar/css/model/property/StandardPropertyFactoryTest.java
@@ -74,10 +74,8 @@ public void should_return_a_valid_column_count_object() {
     assertEquals(2, property.getLinks().size());
     assertEquals("http://dev.w3.org/csswg/css-multicol-1/#propdef-column-count", property.getLinks().get(0));
     assertEquals("https://developer.mozilla.org/en-US/docs/Web/CSS/column-count", property.getLinks().get(1));
-    assertEquals(1, property.getValidators().size());
-    assertEquals(1, property.getVendors().size());
-    assertTrue(property.getVendors().contains(Vendor.MOZILLA));
-    assertFalse(property.getVendors().contains(Vendor.MICROSOFT));
+    assertEquals(2, property.getValidators().size());
+    assertEquals(0, property.getVendors().size());
     assertFalse(property.isObsolete());
   }
 
diff --git a/its/ruling/projects/custom/common/properties/css/column-count.css b/its/ruling/projects/custom/common/properties/css/column-count.css
@@ -1,5 +1,6 @@
 .mybox {
   column-count: inherit;
+  column-count: auto;
   column-count: 0;
   column-count: 10;
   column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: <integer>(>=0)}! */
diff --git a/its/ruling/projects/custom/common/properties/less/column-count.less b/its/ruling/projects/custom/common/properties/less/column-count.less
@@ -1,8 +1,9 @@
 .mybox {
   column-count: inherit;
+  column-count: auto;
   column-count: 0;
   column-count: 10;
-  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: <integer>(>=0)}! */
+  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: auto | <integer>(>=0)}! */
   column-count: none; /* Noncompliant */
   column-count: -10; /* Noncompliant */
 }
diff --git a/its/ruling/projects/custom/common/properties/scss/column-count.scss b/its/ruling/projects/custom/common/properties/scss/column-count.scss
@@ -1,8 +1,9 @@
 .mybox {
   column-count: inherit;
+  column-count: auto;
   column-count: 0;
   column-count: 10;
-  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: <integer>(>=0)}! */
+  column-count: 10.3; /* Noncompliant !{Update the invalid value of property "column-count". Expected format: auto | <integer>(>=0)}! */
   column-count: none; /* Noncompliant */
   column-count: -10; /* Noncompliant */
 }
diff --git a/its/ruling/tests/src/test/expected/css-experimental-property-usage.json b/its/ruling/tests/src/test/expected/css-experimental-property-usage.json
@@ -290,6 +290,7 @@
 5,
 6,
 7,
+8,
 ],
 'project:custom/common/properties/css/column-fill.css':[
 2,
diff --git a/its/ruling/tests/src/test/expected/css-line-length.json b/its/ruling/tests/src/test/expected/css-line-length.json
@@ -428,7 +428,7 @@
 8,
 ],
 'project:custom/common/properties/css/column-count.css':[
-5,
+6,
 ],
 'project:custom/common/properties/css/column-fill.css':[
 6,
diff --git a/its/ruling/tests/src/test/expected/css-validate-property-value.json b/its/ruling/tests/src/test/expected/css-validate-property-value.json
@@ -474,9 +474,9 @@
 20,
 ],
 'project:custom/common/properties/css/column-count.css':[
-5,
 6,
 7,
+8,
 ],
 'project:custom/common/properties/css/column-fill.css':[
 6,
diff --git a/its/ruling/tests/src/test/expected/less-experimental-property-usage.json b/its/ruling/tests/src/test/expected/less-experimental-property-usage.json
@@ -263,6 +263,7 @@
 5,
 6,
 7,
+8,
 ],
 'project:custom/common/properties/less/column-fill.less':[
 2,
diff --git a/its/ruling/tests/src/test/expected/less-line-length.json b/its/ruling/tests/src/test/expected/less-line-length.json
@@ -323,7 +323,7 @@
 8,
 ],
 'project:custom/common/properties/less/column-count.less':[
-5,
+6,
 ],
 'project:custom/common/properties/less/column-fill.less':[
 6,
diff --git a/its/ruling/tests/src/test/expected/less-prefer-single-line-comments.json b/its/ruling/tests/src/test/expected/less-prefer-single-line-comments.json
@@ -695,9 +695,9 @@
 20,
 ],
 'project:custom/common/properties/less/column-count.less':[
-5,
 6,
 7,
+8,
 ],
 'project:custom/common/properties/less/column-fill.less':[
 6,
diff --git a/its/ruling/tests/src/test/expected/less-validate-property-value.json b/its/ruling/tests/src/test/expected/less-validate-property-value.json
@@ -453,9 +453,9 @@
 20,
 ],
 'project:custom/common/properties/less/column-count.less':[
-5,
 6,
 7,
+8,
 ],
 'project:custom/common/properties/less/column-fill.less':[
 6,
diff --git a/its/ruling/tests/src/test/expected/scss-experimental-property-usage.json b/its/ruling/tests/src/test/expected/scss-experimental-property-usage.json
@@ -265,6 +265,7 @@
 5,
 6,
 7,
+8,
 ],
 'project:custom/common/properties/scss/column-fill.scss':[
 2,
diff --git a/its/ruling/tests/src/test/expected/scss-line-length.json b/its/ruling/tests/src/test/expected/scss-line-length.json
@@ -347,7 +347,7 @@
 8,
 ],
 'project:custom/common/properties/scss/column-count.scss':[
-5,
+6,
 ],
 'project:custom/common/properties/scss/column-fill.scss':[
 6,
diff --git a/its/ruling/tests/src/test/expected/scss-prefer-single-line-comments.json b/its/ruling/tests/src/test/expected/scss-prefer-single-line-comments.json
@@ -725,9 +725,9 @@
 15,
 ],
 'project:custom/common/properties/scss/column-count.scss':[
-5,
 6,
 7,
+8,
 ],
 'project:custom/common/properties/scss/column-fill.scss':[
 6,
diff --git a/its/ruling/tests/src/test/expected/scss-validate-property-value.json b/its/ruling/tests/src/test/expected/scss-validate-property-value.json
@@ -434,9 +434,9 @@
 15,
 ],
 'project:custom/common/properties/scss/column-count.scss':[
-5,
 6,
 7,
+8,
 ],
 'project:custom/common/properties/scss/column-fill.scss':[
 6,

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`*/`
`20`	`20`	`package org.sonar.css.model.property.standard;`
`21`	`21`
`22`		`-import org.sonar.css.model.Vendor;`
`23`	`22`	`import org.sonar.css.model.property.StandardProperty;`
`24`	`23`	`import org.sonar.css.model.property.validator.ValidatorFactory;`
`25`	`24`
`@@ -30,8 +29,7 @@ public ColumnCount() {`
`30`	`29`	`addLinks(`
`31`	`30`	`"http://dev.w3.org/csswg/css-multicol-1/#propdef-column-count",`
`32`	`31`	`"https://developer.mozilla.org/en-US/docs/Web/CSS/column-count");`
`33`		`- addVendors(Vendor.MOZILLA);`
`34`		`- addValidators(ValidatorFactory.getPositiveIntegerValidator());`
	`32`	`+ addValidators(ValidatorFactory.getAutoValidator(), ValidatorFactory.getPositiveIntegerValidator());`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`}`
-Original file line number
+Diff line change
 ,
 ,
 ,
 +8,
 ],
 'project:custom/common/properties/css/column-fill.css':[
 ,