summaryrefslogtreecommitdiffstats
path: root/infra/minimal-distribution-test
diff options
context:
space:
mode:
authorMichal Cmarada <mcmarada@cisco.com>2019-04-10 17:43:54 +0200
committerMichal Cmarada <mcmarada@cisco.com>2019-04-10 17:43:54 +0200
commita7a8f9822082e533096e5bdecc531cbaea0f3931 (patch)
tree0b13a21e2360c273eb3d3593bccc37d6474ffb2b /infra/minimal-distribution-test
parent9401e2bf0cd137b0cb57b2ac86cbd643d5460b60 (diff)
HONEYCOMB-448: JAVA 11 support
- updated dependencies - compilation error fixes Change-Id: Iad9d353d06c113a0da892ff11a442e4b41edae0d Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'infra/minimal-distribution-test')
-rw-r--r--infra/minimal-distribution-test/pom.xml2
-rw-r--r--infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/infra/minimal-distribution-test/pom.xml b/infra/minimal-distribution-test/pom.xml
index c8f207bd7..fe3eea2f5 100644
--- a/infra/minimal-distribution-test/pom.xml
+++ b/infra/minimal-distribution-test/pom.xml
@@ -88,7 +88,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java
index 0a9bd9cdf..970687132 100644
--- a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java
+++ b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java
@@ -55,13 +55,13 @@ public class ActiveModuleProviderTest {
assertThat(activeModules, hasItem(isA(Modules.ChildModule3.class)));
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void testLoadActiveModulesFailed() {
final ImmutableList rawResources = of(
"// this should be skipped",
"// io.fd.honeycomb.infra.distro.Modules$ChildModule1",
" io.fd.honeycomb.infra.distro.Modules$ChildModule2",
- "### io.fd.honeycomb.infra.distro.Modules$ChildModule3 ",// it should fail because of this
+ "io.fd.honeycomb.infra.distro.Modules$ChildModule3 ",// it should fail because of this
"io.fd.honeycomb.infra.distro.Modules$ChildModule3",
"io.fd.honeycomb.infra.distro.Modules$NonModule"
);