Fix some tests that were failing on my Mac

This commit is contained in:
Doug Haber
2014-01-10 11:22:43 -05:00
parent 9806fcb289
commit 1b83d882b4

View File

@@ -118,11 +118,6 @@ task clean << {
}
class DebugRhinoTest extends RhinoTest {
def suffix = ""
def expectedCssPath(lessFilePath) {
return lessFilePath.replace('.less', suffix+'.css').replace('\\less\\', '\\css\\'); //FIXME: now it works only on windows
}
def escapeIt(it) {
return it.replaceAll("\\\\", "\\\\\\\\").replaceAll("/", "\\\\/").replaceAll(":", "\\\\:").replaceAll("\\.", "\\\\.");
@@ -146,6 +141,7 @@ class RhinoTest extends DefaultTask {
dependsOn 'setupTest'
}
def suffix = ""
def testDir = ''
def options = []
def expectErrors = false
@@ -165,7 +161,7 @@ class RhinoTest extends DefaultTask {
}
def expectedCssPath(lessFilePath) {
return lessFilePath.replace('.less', '.css').replace('\\less\\', '\\css\\');
lessFilePath.replace('.less', "${suffix}.css").replace("${fs}less${fs}", "${fs}css${fs}");
}
def globalReplacements(input, directory) {
@@ -191,7 +187,7 @@ class RhinoTest extends DefaultTask {
def runTest() {
int testSuccesses = 0, testFailures = 0, testErrors = 0
project.file('test/less/' + testDir).eachFileMatch(FileType.FILES, ~/.*\.less/) { lessFile ->
print lessFile
println "$lessFile"
if (!project.hasProperty('test') || lessFile.name.startsWith(project.test)) {
def out = new java.io.ByteArrayOutputStream()
def execOptions = {
@@ -208,7 +204,7 @@ class RhinoTest extends DefaultTask {
def exec = project.javaexec(execOptions)
def actual = out.toString().trim()
def actualResult = project.file(lessFile.path.replace('test/less', project.testOut).replace('.less', '.css'))
project.file(actualResult.parent).mkdirs()
actualResult << actual
def expected
@@ -235,6 +231,7 @@ class RhinoTest extends DefaultTask {
// println "* expected *"
// println expected
// new File("expected.txt").write(expected)
assert actual == expected
testSuccesses++
println stylize(' ok', 'green')