Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ protected byte[] testProtostuff(Map<String, String> map, Map<String, User> userM

schema.mergeFrom(bai, newModel);

ProtobufFeatureUtils.removeProtobufFeature();
Assert.assertEquals("v1", newModel.getContext().get("k1"));
Assert.assertEquals("v2", newModel.getContext().get("k2"));
Assert.assertEquals("n1", newModel.getUserMap().get("u1").getName());
Expand Down
2 changes: 0 additions & 2 deletions core/src/test/java/io/servicecomb/core/TestConsumer.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public void testReferenceConfig() throws InterruptedException {

@Override
public void run() {
// TODO Auto-generated method stub
oExecutor.setResponse(Response.succResp("success"));

}
Expand Down Expand Up @@ -159,7 +158,6 @@ public void testInvocation() {
oInvocation.next(asyncResp);

} catch (Exception e) {
// TODO Auto-generated catch block
validAssert = false;

}
Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/io/servicecomb/core/TestExecutors.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public void run() {

@Override
public void run() {
// TODO Auto-generated method stub
strThreadTest = "thread Ran";
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,8 @@
* @see
*/
public class MicroServicePropertyExtendedStub implements PropertyExtended {

@Override
public Map<String, String> getExtendedProperties() {
// TODO Auto-generated method stub
return null;
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@

import javax.xml.ws.Holder;

import org.junit.Assert;
import org.junit.Test;
import org.springframework.util.ReflectionUtils;

import io.servicecomb.core.Invocation;
import io.servicecomb.swagger.invocation.AsyncResponse;
import io.servicecomb.swagger.invocation.InvocationType;
import io.servicecomb.swagger.invocation.Response;
import io.servicecomb.swagger.invocation.exception.CommonExceptionData;
import io.servicecomb.swagger.invocation.exception.InvocationException;

import org.junit.Assert;
import org.junit.Test;
import org.springframework.util.ReflectionUtils;

import mockit.Deencapsulation;
import mockit.Mock;
import mockit.MockUp;
Expand Down Expand Up @@ -91,9 +90,12 @@ public void next(AsyncResponse asyncResp) throws Exception {
} catch (Throwable e) {
Assert.assertEquals(3, requestCounter.get());
Assert.assertEquals(1, handler.getActiveCount());

}

AtomicLong responseCounter = Deencapsulation.getField(ShutdownHookHandler.INSTANCE, "responseCounter");
responseCounter.incrementAndGet();
Assert.assertEquals(0, handler.getActiveCount());

// reply exception
// TODO: should be fixed
// try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;

import io.servicecomb.springboot.starter.provider.EnableServiceComb;
import java.net.URI;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -13,43 +13,44 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.client.RestTemplate;

import io.servicecomb.springboot.starter.provider.EnableServiceComb;

@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = RANDOM_PORT, classes = DiscoveryClientIT.DiscoveryTestApplication.class)
public class DiscoveryClientIT {

@Autowired
private DiscoveryClient discoveryClient;
@Autowired
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you use the latest code style in /etc? we standardized to google style

private DiscoveryClient discoveryClient;

@Autowired
private LoadBalancerClient client;
// @Autowired
// private LoadBalancerClient client;

private final RestTemplate restTemplate = new RestTemplate();
private final RestTemplate restTemplate = new RestTemplate();

@Test
public void getsRemoteServiceFromDiscoveryClient() throws Exception {
URI remoteUri = discoveryClient.getInstances("discoveryServer").get(0).getUri();
@Test
public void getsRemoteServiceFromDiscoveryClient() throws Exception {
URI remoteUri = discoveryClient.getInstances("discoveryServer").get(0).getUri();

assertThat(remoteUri).isNotNull();
assertThat(remoteUri).isNotNull();

String response = restTemplate.getForObject(
remoteUri.toString() + "/greeting/sayhello/{name}",
String.class,
"Mike");
String response = restTemplate.getForObject(
remoteUri.toString() + "/greeting/sayhello/{name}",
String.class,
"Mike");

assertThat(response).isEqualTo("hello Mike");
}
assertThat(response).isEqualTo("hello Mike");
}

@SpringBootApplication
@EnableServiceComb
@EnableDiscoveryClient
static class DiscoveryTestApplication {
@SpringBootApplication
@EnableServiceComb
@EnableDiscoveryClient
static class DiscoveryTestApplication {

public static void main(String[] args) throws Exception {
SpringApplication.run(DiscoveryTestApplication.class, args);
public static void main(String[] args) throws Exception {
SpringApplication.run(DiscoveryTestApplication.class, args);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package io.servicecomb.common.exceptions;

public class ServiceCombException extends RuntimeException {
private static final long serialVersionUID = -1085233183289520695L;

public ServiceCombException(String cause, Throwable throwable) {
super(cause, throwable);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,12 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import mockit.MockUp;

import org.junit.Assert;
import org.junit.Test;

public class TestFortifyUtils {

@SuppressWarnings("deprecation")
@Test
public void testFortifyUtils() throws IOException {
Assert.assertEquals("", FortifyUtils.getErrorMsg(null));
Expand Down Expand Up @@ -68,19 +61,6 @@ public void testGetSecurityXmlDocumentFactory() {

}

@Test
public void testReadAttributes() {

Path file = new File("src/test/resources/config/test.1.properties").toPath();

try {
Files.readAttributes(file, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
} catch (IOException e) {
// TODO Auto-generated catch block
Assert.assertTrue(false);
}
}

@Test
public void testGetErrorStack() {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
import mockit.Mocked;

public class CertificateUtilTest {
final String curriedir = System.getProperty("user.dir");

final String strFilePath = curriedir + "/src/test/resources";

class MyX509Certificate extends X509Certificate {
public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
import mockit.MockUp;

public class KeyStoreUtilTest {
final String curriedir = System.getProperty("user.dir");

final String strFilePath = curriedir + "/src/test/resources";
final String strFilePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();

@Test
public void testCreateKeyStoreException() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import javax.net.ssl.SSLSocketFactory;

import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

import mockit.Expectations;
Expand All @@ -44,12 +43,7 @@
import mockit.Mocked;

public class SSLManagerTest {
private static final String DIR = System.getProperty("user.dir") + "/src/test/resources";

@Before
public void setUp() {

}
private final String DIR = Thread.currentThread().getContextClassLoader().getResource("").getPath();

@Test
public void testSSLManagerServerAndClient(final @Mocked NetworkInterface nif) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
import mockit.MockUp;

public class SSLOptionTest {

private static final String DIR = System.getProperty("user.dir") + "/src/test/resources";
private static final String DIR = Thread.currentThread().getContextClassLoader().getResource("").getPath();

@Test
public void testSSLOption() {
Expand Down Expand Up @@ -221,7 +220,7 @@ public void testSSLOptionYamlOption2() throws Exception {
String protocols = option.getProtocols();
option.setProtocols(protocols);
Assert.assertEquals("TLSv1.2", protocols);
System.getProperties().clear();
System.clearProperty("ssl.protocols");
}

@Test
Expand Down Expand Up @@ -314,7 +313,7 @@ public void testSSLOptionNull() {
try {
SSLOption option = SSLOption.build(DIR + "/servers.ssl.properties");
} catch (IllegalArgumentException e) {
Assert.assertEquals("java.lang.IllegalArgumentException", e.getClass().getName());
Assert.assertEquals("Bad file name.", e.getMessage());
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@
import mockit.Mocked;

public class TrustManagerExtTest {
final String curriedir = System.getProperty("user.dir");

final String strFilePath = curriedir + "/src/test/resources";
final String strFilePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();

class MyX509ExtendedTrustManager extends X509ExtendedTrustManager {
public void checkClientTrusted(X509Certificate[] paramArrayOfX509Certificate, String paramString,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,16 @@ public void testTcpClient() throws Exception {

@Override
public boolean isMetricsEnabled() {
// TODO Auto-generated method stub
return true;
}

@Override
public NetClient connect(int port, String host, Handler<AsyncResult<NetSocket>> connectHandler) {
// TODO Auto-generated method stub

return Mockito.mock(NetClient.class);
}

@Override
public void close() {
// TODO Auto-generated method stub

}
};
TcpClientConnection oTcpClient =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,23 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import io.servicecomb.loadbalance.filter.IsolationServerListFilter;
import io.servicecomb.loadbalance.filter.TransactionControlFilter;
import io.servicecomb.swagger.invocation.AsyncResponse;
import io.servicecomb.swagger.invocation.Response;

import org.apache.commons.configuration.AbstractConfiguration;
import org.apache.commons.configuration.BaseConfiguration;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;

import io.servicecomb.core.Invocation;
import io.servicecomb.core.provider.consumer.SyncResponseExecutor;
import com.netflix.config.ConfigurationBackedDynamicPropertySupportImpl;
import com.netflix.config.DynamicPropertyFactory;
import com.netflix.loadbalancer.IRule;
import com.netflix.loadbalancer.reactive.ExecutionListener;

import io.servicecomb.config.ConfigUtil;
import io.servicecomb.core.Invocation;
import io.servicecomb.core.provider.consumer.SyncResponseExecutor;
import io.servicecomb.loadbalance.filter.IsolationServerListFilter;
import io.servicecomb.loadbalance.filter.TransactionControlFilter;
import io.servicecomb.swagger.invocation.AsyncResponse;
import io.servicecomb.swagger.invocation.Response;
import mockit.Deencapsulation;
import mockit.Mock;
import mockit.MockUp;
Expand All @@ -61,9 +59,9 @@ public class TestLoadbalanceHandler {

@BeforeClass
public static void beforeCls() {
AbstractConfiguration configuration = new BaseConfiguration();
DynamicPropertyFactory
.initWithConfigurationSource(new ConfigurationBackedDynamicPropertySupportImpl(configuration));
ConfigUtil.installDynamicConfig();
AbstractConfiguration configuration =
(AbstractConfiguration) DynamicPropertyFactory.getBackingConfigurationSource();
configuration.addProperty("cse.loadbalance.test.transactionControl.policy",
"io.servicecomb.loadbalance.filter.SimpleTransactionControlFilter");
configuration.addProperty("cse.loadbalance.test.transactionControl.options.tag0", "value0");
Expand Down
Loading