diff --git a/implementation/pom.xml b/implementation/pom.xml index a3b96e1d..2e05eae9 100644 --- a/implementation/pom.xml +++ b/implementation/pom.xml @@ -187,12 +187,6 @@ groovy-xml ${groovy.compiler.version} - - - org.apache.ant - ant - 1.9.7 - commons-io diff --git a/implementation/src/test/java/com/avioconsulting/mule/testing/OpenPortLocatorTest.groovy b/implementation/src/test/java/com/avioconsulting/mule/testing/OpenPortLocatorTest.groovy index e78e7410..b45137fc 100644 --- a/implementation/src/test/java/com/avioconsulting/mule/testing/OpenPortLocatorTest.groovy +++ b/implementation/src/test/java/com/avioconsulting/mule/testing/OpenPortLocatorTest.groovy @@ -1,6 +1,6 @@ package com.avioconsulting.mule.testing -import org.apache.tools.ant.taskdefs.condition.Os +import org.apache.commons.lang.SystemUtils import org.junit.Test import static org.hamcrest.Matchers.equalTo @@ -14,7 +14,7 @@ class OpenPortLocatorTest implements OpenPortLocator { // where it's 8088 or 8089 for the first port is not important. What is import is // that the 2nd port is used if the first port is taken and that will be 8090 for Windows // see getHttpPort_secondPortOpen - Os.isFamily(Os.FAMILY_WINDOWS) ? 8089 : 8088 + SystemUtils.IS_OS_WINDOWS ? 8089 : 8088 } @Test diff --git a/test/src/test/java/com/avioconsulting/mule/testing/PatchesTest.groovy b/test/src/test/java/com/avioconsulting/mule/testing/PatchesTest.groovy index 9bd48a9c..b4e74a1e 100644 --- a/test/src/test/java/com/avioconsulting/mule/testing/PatchesTest.groovy +++ b/test/src/test/java/com/avioconsulting/mule/testing/PatchesTest.groovy @@ -1,13 +1,11 @@ package com.avioconsulting.mule.testing import com.avioconsulting.mule.testing.junit.BaseJunitTest -import org.junit.Ignore import org.junit.Test -import static org.hamcrest.Matchers.* +import static org.hamcrest.Matchers.is import static org.junit.Assert.assertThat -@Ignore("We do not currently have any patches") class PatchesTest extends BaseJunitTest implements ConfigTrait { @@ -18,16 +16,20 @@ class PatchesTest extends @Test void patch_exists() { // arrange + def serverPatches = [] // act - def serverPatches = new FileNameFinder().getFileNames('.mule/lib', - '**/*') + new File('.mule/lib').eachFileRecurse { + def filename = it.name + if (filename.endsWith('.jar')) { + serverPatches << filename + } + } // assert - assertThat serverPatches.size(), - is(equalTo(1)) - def patch = serverPatches[0] - assertThat patch, - is(endsWith('MULE-17736-4.2.2-2.0.jar')) + assertThat 'We do not currently have any patches', + serverPatches, + is([ + ]) } }