|
|
119d20 |
diff --git a/pom.xml b/pom.xml
|
|
|
119d20 |
index e12f7e6..bb0745f 100644
|
|
|
119d20 |
--- a/pom.xml
|
|
|
119d20 |
+++ b/pom.xml
|
|
|
119d20 |
@@ -56,7 +56,7 @@
|
|
|
119d20 |
<dependency>
|
|
|
119d20 |
<groupId>junit</groupId>
|
|
|
119d20 |
<artifactId>junit</artifactId>
|
|
|
119d20 |
- <version>4.9</version>
|
|
|
119d20 |
+ <version>4.11</version>
|
|
|
119d20 |
<scope>test</scope>
|
|
|
119d20 |
</dependency>
|
|
|
119d20 |
<dependency>
|
|
|
119d20 |
diff --git a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
|
|
|
119d20 |
index 298cb70..b032da9 100644
|
|
|
119d20 |
--- a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
|
|
|
119d20 |
+++ b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
|
|
|
119d20 |
@@ -73,6 +73,7 @@ public class ExpandTest
|
|
|
119d20 |
* @return
|
|
|
119d20 |
*/
|
|
|
119d20 |
private File getTestTargetDir()
|
|
|
119d20 |
+ throws Exception
|
|
|
119d20 |
{
|
|
|
119d20 |
return tempFolder.newFolder( TEST_ZIP_TARGET_FOLDER );
|
|
|
119d20 |
}
|
|
|
119d20 |
diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
|
|
|
119d20 |
index 6d8cca3..e9e2ca5 100644
|
|
|
119d20 |
--- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
|
|
|
119d20 |
+++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
|
|
|
119d20 |
@@ -25,6 +25,7 @@ import java.lang.reflect.Constructor;
|
|
|
119d20 |
|
|
|
119d20 |
import static org.hamcrest.CoreMatchers.*;
|
|
|
119d20 |
import static org.junit.Assert.assertThat;
|
|
|
119d20 |
+import static org.junit.Assert.assertTrue;
|
|
|
119d20 |
import static org.junit.Assert.fail;
|
|
|
119d20 |
|
|
|
119d20 |
import static org.apache.maven.shared.utils.testhelpers.ExceptionHelper.*;
|
|
|
119d20 |
@@ -116,8 +117,8 @@ public class ReflectorTest
|
|
|
119d20 |
public void newInstancePublicConstructor()
|
|
|
119d20 |
throws Exception
|
|
|
119d20 |
{
|
|
|
119d20 |
- assertThat( reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "" } ),
|
|
|
119d20 |
- is( ReflectorTestHelper.class ) );
|
|
|
119d20 |
+ assertTrue( reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "" } )
|
|
|
119d20 |
+ instanceof ReflectorTestHelper );
|
|
|
119d20 |
}
|
|
|
119d20 |
|
|
|
119d20 |
@Test( expected = NullPointerException.class )
|
|
|
119d20 |
@@ -222,8 +223,8 @@ public class ReflectorTest
|
|
|
119d20 |
public void getSingletonPublicMethod()
|
|
|
119d20 |
throws Exception
|
|
|
119d20 |
{
|
|
|
119d20 |
- assertThat( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "" } ),
|
|
|
119d20 |
- is( ReflectorTestHelper.class ) );
|
|
|
119d20 |
+ assertTrue( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "" } )
|
|
|
119d20 |
+ instanceof ReflectorTestHelper );
|
|
|
119d20 |
}
|
|
|
119d20 |
|
|
|
119d20 |
@Test( expected = NullPointerException.class )
|
|
|
119d20 |
@@ -252,8 +253,8 @@ public class ReflectorTest
|
|
|
119d20 |
public void getSingletonNonStaticMethod()
|
|
|
119d20 |
throws Exception
|
|
|
119d20 |
{
|
|
|
119d20 |
- assertThat( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "", Boolean.FALSE } ),
|
|
|
119d20 |
- is( ReflectorTestHelper.class ) );
|
|
|
119d20 |
+ assertTrue( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "", Boolean.FALSE } )
|
|
|
119d20 |
+ instanceof ReflectorTestHelper );
|
|
|
119d20 |
}
|
|
|
119d20 |
|
|
|
119d20 |
//// invoke( Object, String, Object[] )
|
|
|
119d20 |
@@ -866,8 +867,8 @@ public class ReflectorTest
|
|
|
119d20 |
public void invokeStaticPublicMethod()
|
|
|
119d20 |
throws Exception
|
|
|
119d20 |
{
|
|
|
119d20 |
- assertThat( reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "" } ),
|
|
|
119d20 |
- is( ReflectorTestHelper.class ) );
|
|
|
119d20 |
+ assertTrue( reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "" } )
|
|
|
119d20 |
+ instanceof ReflectorTestHelper );
|
|
|
119d20 |
}
|
|
|
119d20 |
|
|
|
119d20 |
@Test( expected = NullPointerException.class )
|
|
|
119d20 |
@@ -896,9 +897,9 @@ public class ReflectorTest
|
|
|
119d20 |
public void invokeStaticNonStaticMethod()
|
|
|
119d20 |
throws Exception
|
|
|
119d20 |
{
|
|
|
119d20 |
- assertThat(
|
|
|
119d20 |
- reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "", Boolean.FALSE } ),
|
|
|
119d20 |
- is( ReflectorTestHelper.class ) );
|
|
|
119d20 |
+ assertTrue(
|
|
|
119d20 |
+ reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "", Boolean.FALSE } )
|
|
|
119d20 |
+ instanceof ReflectorTestHelper );
|
|
|
119d20 |
}
|
|
|
119d20 |
|
|
|
119d20 |
//// getConstructor( Class, Class[] )
|