Skip to content

Commit

Permalink
Fix tests following changes to constraint
Browse files Browse the repository at this point in the history
Issue #19300
  • Loading branch information
ljacomet committed Dec 14, 2021
1 parent 0122afa commit dc0ffd3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Expand Up @@ -120,7 +120,7 @@ rootProject.name = 'testproject'

expect:
succeeds 'buildEnvironment'
outputContains('org.apache.logging.log4j:log4j-core:{require 2.16.0; reject [2.0, 2.15[} -> 2.16.0 (c)')
outputContains('org.apache.logging.log4j:log4j-core:{require 2.16.0; reject [2.0, 2.16)} -> 2.16.0 (c)')
}

@Issue("gradle/gradle#19300")
Expand Down Expand Up @@ -160,6 +160,6 @@ rootProject.name = 'testproject'

expect:
succeeds 'buildEnvironment'
outputContains('org.apache.logging.log4j:log4j-core:{require 2.16.0; reject [2.0, 2.15[} -> 3.1.0 (c)')
outputContains('org.apache.logging.log4j:log4j-core:{require 2.16.0; reject [2.0, 2.16)} -> 3.1.0 (c)')
}
}
Expand Up @@ -256,7 +256,7 @@ task someTask
def versionPattern = ~/.*-> 2\.(\d+).*/
expect:
succeeds('dependencies', '--configuration', 'zinc')
def log4jOutput = result.getOutputLineThatContains("log4j-core:{require 2.16.0; reject [2.0, 2.15[}")
def log4jOutput = result.getOutputLineThatContains("log4j-core:{require 2.16.0; reject [2.0, 2.16)}")
def matcher = log4jOutput =~ versionPattern
matcher.find()
Integer.valueOf(matcher.group(1)) >= 16
Expand Down

0 comments on commit dc0ffd3

Please sign in to comment.