Skip to content

Commit

Permalink
[issue #12043] module client refact unit test to junit5 (#12044)
Browse files Browse the repository at this point in the history 
* refact(client): remove junit4 to junit5

* fix code style

* format with code style

* fix code style

* fix codestyle
  • Loading branch information
@shalk
shalk committed May 24, 2024
1 parent 992f10a commit 6fa3069
Show file tree
Hide file tree
Showing 85 changed files with 2,799 additions and 2,592 deletions.
74 changes: 40 additions & 34 deletions client/src/test/java/com/alibaba/nacos/client/ability/AbilityTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,57 +25,60 @@
import com.alibaba.nacos.api.remote.response.Response;
import com.alibaba.nacos.client.naming.remote.TestConnection;
import com.alibaba.nacos.common.remote.ConnectionType;
import com.alibaba.nacos.common.remote.client.RpcClient;
import com.alibaba.nacos.common.remote.client.Connection;
import com.alibaba.nacos.common.remote.client.RpcClient;
import com.alibaba.nacos.common.remote.client.RpcClientConfig;
import com.alibaba.nacos.common.remote.client.ServerListFactory;
import com.alibaba.nacos.common.remote.client.ServerRequestHandler;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class AbilityTest {
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

class AbilityTest {

private RpcClient rpcClient;

private Connection connection;

@Test
public void testReceive() throws Exception {
void testReceive() throws Exception {
rpcClient = new RpcClient(new RpcClientConfig() {
@Override
public String name() {
return "test";
}

@Override
public int retryTimes() {
return 1;
}

@Override
public long timeOutMills() {
return 3000L;
}

@Override
public long connectionKeepAlive() {
return 5000L;
}

@Override
public int healthCheckRetryTimes() {
return 1;
}

@Override
public long healthCheckTimeOut() {
return 3000L;
}

@Override
public Map<String, String> labels() {
return new HashMap<>();
Expand All @@ -86,12 +89,12 @@ public Map<String, String> labels() {
public ConnectionType getConnectionType() {
return null;
}

@Override
public int rpcPortOffset() {
return 0;
}

@Override
public Connection connectToServer(ServerInfo serverInfo) throws Exception {
connection = new Connection(new RpcClient.ServerInfo()) {
Expand All @@ -101,33 +104,34 @@ public Connection connectToServer(ServerInfo serverInfo) throws Exception {
super.abilityTable.put(AbilityKey.SERVER_TEST_1.getName(), true);
super.abilityTable.put(AbilityKey.SERVER_TEST_2.getName(), false);
}

@Override
public Response request(Request request, long timeoutMills) throws NacosException {
return null;
}

@Override
public RequestFuture requestFuture(Request request) throws NacosException {
return null;
}

@Override
public void asyncRequest(Request request, RequestCallBack requestCallBack) throws NacosException {

}

@Override
public void close() {

}
};;
};
;
return connection;
}
};
rpcClient.start();
// test not ready
Assert.assertNull(rpcClient.getConnectionAbility(AbilityKey.SERVER_TEST_1));
assertNull(rpcClient.getConnectionAbility(AbilityKey.SERVER_TEST_1));

// test ready
rpcClient.serverListFactory(new ServerListFactory() {
Expand All @@ -136,37 +140,39 @@ public void close() {
public String genNextServer() {
return "localhost:8848";
}

@Override
public String getCurrentServer() {
return "localhost:8848";
}

@Override
public List<String> getServerList() {
return null;
}
});
rpcClient.start();
// if connect successfully
Assert.assertEquals(rpcClient.getConnectionAbility(AbilityKey.SERVER_TEST_1), AbilityStatus.SUPPORTED);
Assert.assertEquals(rpcClient.getConnectionAbility(AbilityKey.SERVER_TEST_2), AbilityStatus.NOT_SUPPORTED);
assertEquals(AbilityStatus.SUPPORTED, rpcClient.getConnectionAbility(AbilityKey.SERVER_TEST_1));
assertEquals(AbilityStatus.NOT_SUPPORTED, rpcClient.getConnectionAbility(AbilityKey.SERVER_TEST_2));
}

@After
public void testServerRequestAbility() {
@AfterEach
void testServerRequestAbility() {
//test support
ServerRequestHandler serverRequestHandler = (request, connection) -> {
Assert.assertEquals(connection.getConnectionAbility(AbilityKey.SERVER_TEST_1), AbilityStatus.SUPPORTED);
Assert.assertEquals(connection.getConnectionAbility(AbilityKey.SERVER_TEST_2), AbilityStatus.NOT_SUPPORTED);
return new Response() { };
assertEquals(AbilityStatus.SUPPORTED, connection.getConnectionAbility(AbilityKey.SERVER_TEST_1));
assertEquals(AbilityStatus.NOT_SUPPORTED, connection.getConnectionAbility(AbilityKey.SERVER_TEST_2));
return new Response() {
};
};
serverRequestHandler.requestReply(null, connection);

// test no ability table
serverRequestHandler = (request, connection) -> {
Assert.assertEquals(connection.getConnectionAbility(AbilityKey.SERVER_TEST_1), AbilityStatus.UNKNOWN);
return new Response() { };
assertEquals(AbilityStatus.UNKNOWN, connection.getConnectionAbility(AbilityKey.SERVER_TEST_1));
return new Response() {
};
};
serverRequestHandler.requestReply(null, new TestConnection(new RpcClient.ServerInfo()));
}
Expand Down
18 changes: 9 additions & 9 deletions client/src/test/java/com/alibaba/nacos/client/ability/ClientAbilityControlManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@

import com.alibaba.nacos.api.ability.constant.AbilityKey;
import com.alibaba.nacos.api.ability.constant.AbilityMode;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.util.Map;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class ClientAbilityControlManagerTest {
class ClientAbilityControlManagerTest {

ClientAbilityControlManager clientAbilityControlManager;

@Before
public void setUp() {
@BeforeEach
void setUp() {
clientAbilityControlManager = new ClientAbilityControlManager();
}

@Test
public void testInitCurrentNodeAbilities() {
void testInitCurrentNodeAbilities() {
Map<AbilityMode, Map<AbilityKey, Boolean>> actual = clientAbilityControlManager.initCurrentNodeAbilities();
assertEquals(1, actual.size());
assertTrue(actual.containsKey(AbilityMode.SDK_CLIENT));
Expand All @@ -45,7 +45,7 @@ public void testInitCurrentNodeAbilities() {
}

@Test
public void testGetPriority() {
void testGetPriority() {
assertEquals(0, clientAbilityControlManager.getPriority());
}
}

0 comments on commit 6fa3069

Please sign in to comment.