|
|
a62535 |
From 613f27fe7ff4a89c21689a16f6f6b9b3e0b7c347 Mon Sep 17 00:00:00 2001
|
|
|
a62535 |
From: Marian Koncek <mkoncek@redhat.com>
|
|
|
a62535 |
Date: Thu, 29 Aug 2019 15:04:46 +0200
|
|
|
a62535 |
Subject: [PATCH] Port to hamcrest 2.1
|
|
|
a62535 |
|
|
|
a62535 |
---
|
|
|
a62535 |
.../shared/utils/reflection/ReflectorTest.java | 14 +++++++-------
|
|
|
a62535 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
a62535 |
|
|
|
a62535 |
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
|
|
|
a62535 |
index 0088361..09f6048 100644
|
|
|
a62535 |
--- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
|
|
|
a62535 |
+++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
|
|
|
a62535 |
@@ -50,7 +50,7 @@ public class ReflectorTest
|
|
|
a62535 |
public void newInstanceClassNull()
|
|
|
a62535 |
throws Exception
|
|
|
a62535 |
{
|
|
|
a62535 |
- assertThat( reflector.newInstance( Object.class, null ), is( Object.class ) );
|
|
|
a62535 |
+ assertThat( reflector.newInstance( Object.class, null ), isA( Object.class ) );
|
|
|
a62535 |
}
|
|
|
a62535 |
|
|
|
a62535 |
@Test( expected = NullPointerException.class )
|
|
|
a62535 |
@@ -64,7 +64,7 @@ public class ReflectorTest
|
|
|
a62535 |
public void newInstanceClassEmptyArray()
|
|
|
a62535 |
throws Exception
|
|
|
a62535 |
{
|
|
|
a62535 |
- assertThat( reflector.newInstance( Object.class, new Object[0] ), is( Object.class ) );
|
|
|
a62535 |
+ assertThat( reflector.newInstance( Object.class, new Object[0] ), isA( Object.class ) );
|
|
|
a62535 |
}
|
|
|
a62535 |
|
|
|
a62535 |
@Test( expected = ReflectorException.class )
|
|
|
a62535 |
@@ -156,7 +156,7 @@ public class ReflectorTest
|
|
|
a62535 |
public void getSingletonClassNull()
|
|
|
a62535 |
throws Exception
|
|
|
a62535 |
{
|
|
|
a62535 |
- assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), is( Object.class ) );
|
|
|
a62535 |
+ assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), isA( Object.class ) );
|
|
|
a62535 |
}
|
|
|
a62535 |
|
|
|
a62535 |
@Test( expected = NullPointerException.class )
|
|
|
a62535 |
@@ -170,7 +170,7 @@ public class ReflectorTest
|
|
|
a62535 |
public void getSingletonClassEmptyArray()
|
|
|
a62535 |
throws Exception
|
|
|
a62535 |
{
|
|
|
a62535 |
- assertThat( reflector.getSingleton( Object.class, new Object[0] ), is( Object.class ) );
|
|
|
a62535 |
+ assertThat( reflector.getSingleton( Object.class, new Object[0] ), isA( Object.class ) );
|
|
|
a62535 |
}
|
|
|
a62535 |
|
|
|
a62535 |
@Test( expected = ReflectorException.class )
|
|
|
a62535 |
@@ -787,7 +787,7 @@ public class ReflectorTest
|
|
|
a62535 |
public void invokeStaticClassNullNull()
|
|
|
a62535 |
throws Exception
|
|
|
a62535 |
{
|
|
|
a62535 |
- assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), is( Object.class ) );
|
|
|
a62535 |
+ assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), isA( Object.class ) );
|
|
|
a62535 |
}
|
|
|
a62535 |
|
|
|
a62535 |
@Test( expected = NullPointerException.class )
|
|
|
a62535 |
@@ -801,7 +801,7 @@ public class ReflectorTest
|
|
|
a62535 |
public void invokeStaticClassNullEmptyArray()
|
|
|
a62535 |
throws Exception
|
|
|
a62535 |
{
|
|
|
a62535 |
- assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), is( Object.class ) );
|
|
|
a62535 |
+ assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), isA( Object.class ) );
|
|
|
a62535 |
}
|
|
|
a62535 |
|
|
|
a62535 |
@Test( expected = NullPointerException.class )
|
|
|
a62535 |
@@ -829,7 +829,7 @@ public class ReflectorTest
|
|
|
a62535 |
public void invokeStaticClassEmptyEmptyArray()
|
|
|
a62535 |
throws Exception
|
|
|
a62535 |
{
|
|
|
a62535 |
- assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), is( Object.class ) );
|
|
|
a62535 |
+ assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), isA( Object.class ) );
|
|
|
a62535 |
}
|
|
|
a62535 |
|
|
|
a62535 |
@Test( expected = IllegalArgumentException.class )
|
|
|
a62535 |
--
|
|
|
a62535 |
2.21.0
|
|
|
a62535 |
|