diff options
author | Ilpo Ruotsalainen <ilpo.ruotsalainen@oath.com> | 2018-11-29 14:49:35 +0100 |
---|---|---|
committer | Ilpo Ruotsalainen <ilpo.ruotsalainen@oath.com> | 2018-11-29 14:49:35 +0100 |
commit | 0db179c65ddfc45379b0cbc6f0782ef538d1b76f (patch) | |
tree | 8a123b6c81b9bdea2bf67af7489a42d8738f7895 /abi-check-plugin | |
parent | a3e8241dbfda9952f9be93c23e073df4efd09f3a (diff) |
Remove unwanted dependencies and use JUnit5.
Diffstat (limited to 'abi-check-plugin')
-rw-r--r-- | abi-check-plugin/pom.xml | 32 | ||||
-rw-r--r-- | abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java | 10 |
2 files changed, 28 insertions, 14 deletions
diff --git a/abi-check-plugin/pom.xml b/abi-check-plugin/pom.xml index e8575fd8a59..ead5d5f24d3 100644 --- a/abi-check-plugin/pom.xml +++ b/abi-check-plugin/pom.xml @@ -24,30 +24,42 @@ <version>3.5.0</version> </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.5.0</version> + </dependency> + <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - <version>3.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - <version>3.0</version> - </dependency> - <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> <version>7.0</version> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>24.0-jre</version> + </dependency> + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.8.5</version> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>5.3.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> </dependencies> <build> <finalName>${project.artifactId}</finalName> diff --git a/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java b/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java index f64d9c3b8fc..eaa49789f2f 100644 --- a/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java +++ b/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java @@ -1,10 +1,11 @@ package com.yahoo.abicheck; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.yahoo.abicheck.collector.Util; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.objectweb.asm.Opcodes; public class AccessConversionTest { @@ -38,9 +39,10 @@ public class AccessConversionTest { Util.fieldFlags)); } - @Test(expected = IllegalArgumentException.class) + @Test public void testUnsupportedFlags() { // ACC_MODULE is not a valid flag for fields - Util.convertAccess(Opcodes.ACC_MODULE, Util.fieldFlags); + assertThrows(IllegalArgumentException.class, + () -> Util.convertAccess(Opcodes.ACC_MODULE, Util.fieldFlags)); } } |