DUBBO-77 增加ExceptionFilter测试用例

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@348 1a56cb94-b969-4eaa-88fa-be21384802f2

dubbo-rpc/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java

@@ -38,7 +38,15 @@ import com.alibaba.dubbo.rpc.service.GenericService;
 @Extension("exception")
 public class ExceptionFilter implements Filter {
 
-    private static final Logger logger = LoggerFactory.getLogger(ExceptionFilter.class);
+    private final Logger logger;
+    
+    public ExceptionFilter() {
+        this(LoggerFactory.getLogger(ExceptionFilter.class));
+    }
+    
+    public ExceptionFilter(Logger logger) {
+        this.logger = logger;
+    }
     
     public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
         try {
@@ -73,7 +81,7 @@ public class ExceptionFilter implements Filter {
             }
             return result;
         } catch (RuntimeException e) {
-            logger.error("Got unchecked and undeclare service method invoke exception: " + e.getMessage(), e);
+            logger.error("Got unchecked and undeclare service " + invoker.getInterface().getName() + " method " + invocation.getMethodName() + " invoke exception: " + e.getMessage(), e);
             throw e;
         }
     }

dubbo-rpc/src/test/java/com/alibaba/dubbo/rpc/filter/ExceptionFilterTest.java

+/*
+ * Copyright 1999-2011 Alibaba Group.
+ *  
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *  
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.rpc.filter;
+
+import static org.junit.Assert.assertEquals;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+import com.alibaba.dubbo.common.logger.Logger;
+import com.alibaba.dubbo.rpc.Invoker;
+import com.alibaba.dubbo.rpc.RpcException;
+import com.alibaba.dubbo.rpc.RpcInvocation;
+import com.alibaba.dubbo.rpc.support.DemoService;
+
+/**
+ * ExceptionFilterTest
+ * 
+ * @author william.liangf
+ */
+public class ExceptionFilterTest {
+    
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testRpcException() {
+        Logger logger = EasyMock.createMock(Logger.class);
+        RpcException exception = new RpcException("TestRpcException");
+        logger.error(EasyMock.eq("Got unchecked and undeclare service " + DemoService.class.getName() + " method sayHello invoke exception: TestRpcException"), EasyMock.eq(exception));
+        ExceptionFilter exceptionFilter = new ExceptionFilter(logger);
+        RpcInvocation invocation = new RpcInvocation("sayHello", new Class<?>[]{String.class}, new Object[]{"world"});
+        Invoker<DemoService> invoker = EasyMock.createMock(Invoker.class);
+        EasyMock.expect(invoker.getInterface()).andReturn(DemoService.class);
+        EasyMock.expect(invoker.invoke(EasyMock.eq(invocation))).andThrow(exception);
+        
+        EasyMock.replay(logger, invoker);
+        
+        try {
+            exceptionFilter.invoke(invoker, invocation);
+        } catch (RpcException e) {
+            assertEquals("TestRpcException", e.getMessage());
+        }
+        EasyMock.verify(logger, invoker);
+    }
+    
+}