Commit 6543814f authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge pull request #544 from OpenSkywalking/fix/sjdbcbug 

Plugin test must compile with jdk 1.6, so not allow to use lambda.
parents 0e23b024 12c3c4ef

apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/test/java/org/skywalking/apm/plugin/sjdbc/InterceptorTest.java

+30 −22
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import com.dangdang.ddframe.rdb.sharding.executor.threadlocal.ExecutorDataMap; 
import com.dangdang.ddframe.rdb.sharding.util.EventBusInstance;

import com.google.common.base.Optional;

import java.sql.SQLException;

import java.util.Arrays;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Map;
@@ -118,9 +118,11 @@ public class InterceptorTest { 
        executeInterceptor.beforeMethod(null, null, allArguments, null, null);

        asyncExecuteInterceptor.beforeMethod(null, null, null, null, null);

        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();

        ES.submit(() -> {

        ES.submit(new Runnable() {

            @Override public void run() {

                ExecutorDataMap.setDataMap(dataMap);

                sendEvent("ds_1", "select * from t_order_1");

            }

        }).get();

        asyncExecuteInterceptor.afterMethod(null, null, null, null, null);

        sendEvent("ds_0", "select * from t_order_0");
@@ -146,9 +148,11 @@ public class InterceptorTest { 
        executeInterceptor.beforeMethod(null, null, allArguments, null, null);

        asyncExecuteInterceptor.beforeMethod(null, null, null, null, null);

        final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();

        ES.submit(() -> {

        ES.submit(new Runnable() {

            @Override public void run() {

                ExecutorDataMap.setDataMap(dataMap);

                sendError();

            }

        }).get();

        asyncExecuteInterceptor.handleMethodException(null, null, null, null, new SQLException("test"));

        asyncExecuteInterceptor.afterMethod(null, null, null, null, null);
@@ -184,7 +188,11 @@ public class InterceptorTest { 
    }



    private void sendEvent(String datasource, String sql) {

        DQLExecutionEvent event = new DQLExecutionEvent(datasource, sql, Arrays.asList("1", 100));

        List<Object> parameters = new ArrayList<Object>();

        parameters.add("1");

        parameters.add(100);



        DQLExecutionEvent event = new DQLExecutionEvent(datasource, sql, parameters);

        EventBusInstance.getInstance().post(event);

        event.setEventExecutionType(EventExecutionType.EXECUTE_SUCCESS);

        EventBusInstance.getInstance().post(event);