Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #16357: Broken test on whitespace matching and regex is invalid for multiline #2661

Merged
merged 1 commit into from
Dec 6, 2019
Merged

Fixes #16357: Broken test on whitespace matching and regex is invalid for multiline #2661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/Technique.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@

package com.normation.rudder.ncf

import java.util.regex.Pattern

import com.normation.errors.PureResult
import com.normation.errors.Unexpected

import cats.data.NonEmptyList
import com.normation.inventory.domain.Version
import com.normation.inventory.domain.AgentType
Expand Down Expand Up @@ -202,7 +203,7 @@ object Constraint {

case object NoWhiteSpace extends Constraint {
def check(value: String): CheckResult = {
if (value.matches("""^(?!\s).*(?<!\s)$""")) {
if (Pattern.compile("""^(?!\s).*(?<!\s)$""", Pattern.DOTALL).asPredicate().test(value)) {
OK
} else {
NOK(one("Must not have leading or trailing whitespaces"))
Expand Down
6 changes: 3 additions & 3 deletions ...rces/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestTechniqueWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,14 @@ class TestTechniqueWriter extends Specification with ContentMatchers with Loggab
val value3 = "S"
val value4 = "ééé ```"
val value5 = "sdfsqdfsqfsdf sfhdskjhdfs jkhsdkfjhksqdhf"
val value6 = ""

Constraint.NoWhiteSpace.check(value1) must equalTo(Constraint.OK)
Constraint.NoWhiteSpace.check(value2) must equalTo(Constraint.OK)
Constraint.NoWhiteSpace.check(value3) must equalTo(Constraint.OK)
Constraint.NoWhiteSpace.check(value4) must equalTo(Constraint.OK)
Constraint.NoWhiteSpace.check(value5) must equalTo(Constraint.OK)
Constraint.NoWhiteSpace.check(value6) must equalTo(Constraint.OK)
}

"Correctly refuse text starting or ending with withspace" in {
Expand All @@ -422,14 +424,12 @@ class TestTechniqueWriter extends Specification with ContentMatchers with Loggab
""" Some
|text""".stripMargin
val value3 = " "
val value4 = ""
val value5 = "sdfsqdfsqfsdf sfhdskjhdfs jkhsdkfjhksqdhf "
val value4 = "sdfsqdfsqfsdf sfhdskjhdfs jkhsdkfjhksqdhf "

Constraint.NoWhiteSpace.check(value1) must haveClass[Constraint.NOK]
Constraint.NoWhiteSpace.check(value2) must haveClass[Constraint.NOK]
Constraint.NoWhiteSpace.check(value3) must haveClass[Constraint.NOK]
Constraint.NoWhiteSpace.check(value4) must haveClass[Constraint.NOK]
Constraint.NoWhiteSpace.check(value5) must haveClass[Constraint.NOK]
}
}

Expand Down