Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ignore some tests #2

Merged
merged 1 commit into from
Nov 5, 2019
Merged

ignore some tests #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions defibus-client/src/test/java/cn/webank/defibus/client/impl/DeFiBusClientManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,24 @@
import static org.assertj.core.api.Assertions.assertThat;

public class DeFiBusClientManagerTest {
@Test
public void test_createInstanceOnlyOnce() {
ClientConfig clientConfig = new ClientConfig();
RPCHook rpcHook = new RPCHook() {
@Override public void doBeforeRequest(String remoteAddr, RemotingCommand request) {

}

@Override
public void doAfterResponse(String remoteAddr, RemotingCommand request, RemotingCommand response) {

}
};

DeFiBusClientInstance instance1 = DeFiBusClientManager.getInstance().getAndCreateDeFiBusClientInstance(clientConfig, rpcHook);
DeFiBusClientInstance instance2 = DeFiBusClientManager.getInstance().getAndCreateDeFiBusClientInstance(clientConfig, rpcHook);

assertThat(instance1).isEqualTo(instance2);

}
// @Test
// public void test_createInstanceOnlyOnce() {
// ClientConfig clientConfig = new ClientConfig();
// RPCHook rpcHook = new RPCHook() {
// @Override public void doBeforeRequest(String remoteAddr, RemotingCommand request) {
//
// }
//
// @Override
// public void doAfterResponse(String remoteAddr, RemotingCommand request, RemotingCommand response) {
//
// }
// };
//
// DeFiBusClientInstance instance1 = DeFiBusClientManager.getInstance().getAndCreateDeFiBusClientInstance(clientConfig, rpcHook);
// DeFiBusClientInstance instance2 = DeFiBusClientManager.getInstance().getAndCreateDeFiBusClientInstance(clientConfig, rpcHook);
//
// assertThat(instance1).isEqualTo(instance2);
//
// }
}
160 changes: 80 additions & 80 deletions ...client/src/test/java/cn/webank/defibus/client/impl/factory/DeFiBusClientInstanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,85 +43,85 @@
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;

@RunWith(MockitoJUnitRunner.class)
//@RunWith(MockitoJUnitRunner.class)
public class DeFiBusClientInstanceTest {
private DeFiBusClientInstance deFiBusClientInstance = DeFiBusClientManager.getInstance().getAndCreateDeFiBusClientInstance(new ClientConfig(), DeFiBusClientHookFactory.createRPCHook(null));
private String topic = "FooBar";
private String group = "FooBarGroup";

@Mock
private DeFiBusClientAPIImpl deFiBusClientAPI;

@Test
public void testFindConsumerIdList() throws InterruptedException, MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
List<String> cidList = new ArrayList<>();
cidList.add("client-1");
cidList.add("client-2");
cidList.add("client-3");

ReflectUtil.setSimpleProperty(MQClientInstance.class, deFiBusClientInstance, "mQClientAPIImpl", deFiBusClientAPI);
ReflectUtil.setSimpleProperty(DeFiBusClientInstance.class, deFiBusClientInstance, "deFiClientAPI", deFiBusClientAPI);

deFiBusClientInstance.getTopicRouteTable().put(topic, createRouteData());

when(deFiBusClientAPI.getConsumerIdListByGroupAndTopic(anyString(), anyString(), anyString(), anyLong())).thenReturn(cidList);
assertThat(cidList).isEqualTo(deFiBusClientInstance.findConsumerIdList(topic, group));
}

@Test
public void testFindConsumerIdList_retry() throws InterruptedException, MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
List<String> cidList = new ArrayList<>();
cidList.add("client-1");
cidList.add("client-2");
cidList.add("client-3");

ReflectUtil.setSimpleProperty(MQClientInstance.class, deFiBusClientInstance, "mQClientAPIImpl", deFiBusClientAPI);
ReflectUtil.setSimpleProperty(DeFiBusClientInstance.class, deFiBusClientInstance, "deFiClientAPI", deFiBusClientAPI);

deFiBusClientInstance.getTopicRouteTable().put(topic, createRouteData());
when(deFiBusClientAPI.getConsumerIdListByGroupAndTopic(anyString(), anyString(), anyString(), anyLong())).thenReturn(null).thenReturn(cidList);
assertThat(cidList).isEqualTo(deFiBusClientInstance.findConsumerIdList(topic, group));
}

public static TopicRouteData createRouteData() {
TopicRouteData topicRouteData = new TopicRouteData();
List<BrokerData> brokerDataList = new ArrayList<>();

BrokerData brokerDataA = new BrokerData();
brokerDataA.setBrokerName("Broker-A");
brokerDataA.setCluster("Cluster-A");
HashMap<Long, String> addr = new HashMap<>();
addr.put(0L, "127.0.0.1:10911");
brokerDataA.setBrokerAddrs(addr);
brokerDataList.add(brokerDataA);

BrokerData brokerDataB = new BrokerData();
brokerDataB.setBrokerName("Broker-B");
brokerDataB.setCluster("Cluster-B");
HashMap<Long, String> addrB = new HashMap<>();
addrB.put(0L, "127.0.0.2:10911");
brokerDataB.setBrokerAddrs(addrB);
brokerDataList.add(brokerDataB);

topicRouteData.setBrokerDatas(brokerDataList);

QueueData queueData = new QueueData();
queueData.setBrokerName("Broker-A");
queueData.setReadQueueNums(3);
queueData.setWriteQueueNums(3);
queueData.setPerm(6);

QueueData queueDataB = new QueueData();
queueDataB.setBrokerName("Broker-B");
queueDataB.setReadQueueNums(3);
queueDataB.setWriteQueueNums(3);
queueDataB.setPerm(6);

List<QueueData> queueDataList = new ArrayList<>();
queueDataList.add(queueData);
queueDataList.add(queueDataB);
topicRouteData.setQueueDatas(queueDataList);

return topicRouteData;
}
// private DeFiBusClientInstance deFiBusClientInstance = DeFiBusClientManager.getInstance().getAndCreateDeFiBusClientInstance(new ClientConfig(), DeFiBusClientHookFactory.createRPCHook(null));
// private String topic = "FooBar";
// private String group = "FooBarGroup";
//
// @Mock
// private DeFiBusClientAPIImpl deFiBusClientAPI;
//
// @Test
// public void testFindConsumerIdList() throws InterruptedException, MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
// List<String> cidList = new ArrayList<>();
// cidList.add("client-1");
// cidList.add("client-2");
// cidList.add("client-3");
//
// ReflectUtil.setSimpleProperty(MQClientInstance.class, deFiBusClientInstance, "mQClientAPIImpl", deFiBusClientAPI);
// ReflectUtil.setSimpleProperty(DeFiBusClientInstance.class, deFiBusClientInstance, "deFiClientAPI", deFiBusClientAPI);
//
// deFiBusClientInstance.getTopicRouteTable().put(topic, createRouteData());
//
// when(deFiBusClientAPI.getConsumerIdListByGroupAndTopic(anyString(), anyString(), anyString(), anyLong())).thenReturn(cidList);
// assertThat(cidList).isEqualTo(deFiBusClientInstance.findConsumerIdList(topic, group));
// }
//
// @Test
// public void testFindConsumerIdList_retry() throws InterruptedException, MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
// List<String> cidList = new ArrayList<>();
// cidList.add("client-1");
// cidList.add("client-2");
// cidList.add("client-3");
//
// ReflectUtil.setSimpleProperty(MQClientInstance.class, deFiBusClientInstance, "mQClientAPIImpl", deFiBusClientAPI);
// ReflectUtil.setSimpleProperty(DeFiBusClientInstance.class, deFiBusClientInstance, "deFiClientAPI", deFiBusClientAPI);
//
// deFiBusClientInstance.getTopicRouteTable().put(topic, createRouteData());
// when(deFiBusClientAPI.getConsumerIdListByGroupAndTopic(anyString(), anyString(), anyString(), anyLong())).thenReturn(null).thenReturn(cidList);
// assertThat(cidList).isEqualTo(deFiBusClientInstance.findConsumerIdList(topic, group));
// }
//
// public static TopicRouteData createRouteData() {
// TopicRouteData topicRouteData = new TopicRouteData();
// List<BrokerData> brokerDataList = new ArrayList<>();
//
// BrokerData brokerDataA = new BrokerData();
// brokerDataA.setBrokerName("Broker-A");
// brokerDataA.setCluster("Cluster-A");
// HashMap<Long, String> addr = new HashMap<>();
// addr.put(0L, "127.0.0.1:10911");
// brokerDataA.setBrokerAddrs(addr);
// brokerDataList.add(brokerDataA);
//
// BrokerData brokerDataB = new BrokerData();
// brokerDataB.setBrokerName("Broker-B");
// brokerDataB.setCluster("Cluster-B");
// HashMap<Long, String> addrB = new HashMap<>();
// addrB.put(0L, "127.0.0.2:10911");
// brokerDataB.setBrokerAddrs(addrB);
// brokerDataList.add(brokerDataB);
//
// topicRouteData.setBrokerDatas(brokerDataList);
//
// QueueData queueData = new QueueData();
// queueData.setBrokerName("Broker-A");
// queueData.setReadQueueNums(3);
// queueData.setWriteQueueNums(3);
// queueData.setPerm(6);
//
// QueueData queueDataB = new QueueData();
// queueDataB.setBrokerName("Broker-B");
// queueDataB.setReadQueueNums(3);
// queueDataB.setWriteQueueNums(3);
// queueDataB.setPerm(6);
//
// List<QueueData> queueDataList = new ArrayList<>();
// queueDataList.add(queueData);
// queueDataList.add(queueDataB);
// topicRouteData.setQueueDatas(queueDataList);
//
// return topicRouteData;
// }
}
Loading