8000 Switch to wildcard static imports to work around a javac bug · rabbitmq/rabbitmq-java-client@daa6300 · GitHub
[go: up one dir, main page]
Skip to content

Commit daa6300

Browse files
michaelklishinmichaelklishin
committed
Switch to wildcard static imports to work around a javac bug
See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=7159016. Fixes #293.
1 parent 06094b3 commit daa6300

File tree

5 files changed

+12
-18
lines changed

5 files changed

+12
-18
lines changed

‎src/test/java/com/rabbitmq/client/test/AMQChannelTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@
3232
import java.util.concurrent.ScheduledExecutorService;
3333
import java.util.concurrent.TimeUnit;
3434

35-
import static org.hamcrest.Matchers.is;
35+
import static org.hamcrest.Matchers.*;
3636
import static org.junit.Assert.*;
37-
import static org.mockito.Mockito.mock;
38-
import static org.mockito.Mockito.when;
37+
import static org.mockito.Mockito.*;
3938

4039
public class AMQChannelTest {
4140

‎src/test/java/com/rabbitmq/client/test/ChannelRpcTimeoutIntegrationTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
import java.util.concurrent.ThreadFactory;
2828
import java.util.concurrent.TimeoutException;
2929

30-
import static org.hamcrest.Matchers.instanceOf;
31-
import static org.hamcrest.Matchers.is;
32-
import static org.junit.Assert.assertThat;
33-
import static org.junit.Assert.fail;
30+
import static org.hamcrest.Matchers.*;
31+
import static org.junit.Assert.*;
3432

3533
public class ChannelRpcTimeoutIntegrationTest {
3634

‎src/test/java/com/rabbitmq/client/test/FrameTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import java.nio.channels.WritableByteChannel;
1616
import java.util.*;
1717

18-
import static org.hamcrest.Matchers.equalTo;
19-
import static org.junit.Assert.assertThat;
18+
import static org.hamcrest.Matchers.*;
19+
import static org.junit.Assert.*;
2020

2121
/**
2222
*

‎src/test/java/com/rabbitmq/client/test/StandardMetricsCollectorTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
import com.rabbitmq.client.impl.StandardMetricsCollector;
2121
import org.junit.Test;
2222

23-
import static org.hamcrest.Matchers.is;
24-
import static org.junit.Assert.assertThat;
25-
import static org.mockito.Mockito.mock;
26-
import static org.mockito.Mockito.when;
23+
import static org.hamcrest.Matchers.*;
24+
import static org.junit.Assert.*;
25+
import static org.mockito.Mockito.*;
2726

2827
/**
2928
*

‎src/test/java/com/rabbitmq/client/test/functional/Metrics.java

Lines changed: 3 additions & 5 deletions
< 8D22 tr>
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@
3232
import java.util.Random;
3333
import java.util.concurrent.*;
3434

35-
import static org.awaitility.Awaitility.waitAtMost;
36-
import static org.hamcrest.Matchers.equalTo;
37-
import static org.hamcrest.Matchers.is;
38-
import static org.junit.Assert.assertThat;
39-
import static org.junit.Assert.assertTrue;
35+
import static org.awaitility.Awaitility.*;
36+
import static org.hamcrest.Matchers.*;
37+
import static org.junit.Assert.*;
4038

4139
/**
4240
*

0 commit comments

Comments
 (0)
0