Author: elecharny
Date: Thu Sep 4 08:13:09 2008
New Revision: 692090
URL: http://svn.apache.org/viewvc?rev=692090&view=rev
Log:
o Added a NoopFilter to be used in the chain's tests
o Modified the tests to use this newly created NoopFilter
o Minor refactoring in IoFilterAdapter (spaces removal)
o Removed commented code in VmPipe test
Added:
mina/trunk/core/src/main/java/org/apache/mina/filter/util/NoopFilter.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java
mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java
mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java?rev=692090&r1=692089&r2=692090&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java
Thu Sep 4 08:13:09 2008
@@ -49,28 +49,28 @@
* [EMAIL PROTECTED]
*/
public void onPreAdd(IoFilterChain parent, String name,
- NextFilter nextFilter) throws Exception {
+ NextFilter nextFilter) throws Exception {
}
/**
* [EMAIL PROTECTED]
*/
public void onPostAdd(IoFilterChain parent, String name,
- NextFilter nextFilter) throws Exception {
+ NextFilter nextFilter) throws Exception {
}
/**
* [EMAIL PROTECTED]
*/
public void onPreRemove(IoFilterChain parent, String name,
- NextFilter nextFilter) throws Exception {
+ NextFilter nextFilter) throws Exception {
}
/**
* [EMAIL PROTECTED]
*/
public void onPostRemove(IoFilterChain parent, String name,
- NextFilter nextFilter) throws Exception {
+ NextFilter nextFilter) throws Exception {
}
/**
Added: mina/trunk/core/src/main/java/org/apache/mina/filter/util/NoopFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/util/NoopFilter.java?rev=692090&view=auto
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/util/NoopFilter.java
(added)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/util/NoopFilter.java
Thu Sep 4 08:13:09 2008
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.mina.filter.util;
+
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+
+/**
+ * A Noop filter. It does nothing, as all the method are already implemented
+ * in the super class.<br/>
+ *
+ * This class is used by tests, when some faked filter is needed to test that
the
+ * chain is working properly when adding or removing a filter.
+ *
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
+ * @version $Rev: 671827 $, $Date: 2008-06-26 10:49:48 +0200 (Thu, 26 Jun
2008) $
+ */
+public class NoopFilter extends IoFilterAdapter {
+ /**
+ * Default Constructor.
+ */
+ public NoopFilter() {
+ super();
+ }
+}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java?rev=692090&r1=692089&r2=692090&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java
Thu Sep 4 08:13:09 2008
@@ -26,6 +26,7 @@
import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.filterchain.IoFilterAdapter;
import org.apache.mina.core.filterchain.IoFilterChain.Entry;
+import org.apache.mina.filter.util.NoopFilter;
/**
* Tests [EMAIL PROTECTED] DefaultIoFilterChainBuilder}.
@@ -49,14 +50,14 @@
public void testAdd() throws Exception {
DefaultIoFilterChainBuilder builder = new
DefaultIoFilterChainBuilder();
- builder.addFirst("A", new IoFilterAdapter());
- builder.addLast("B", new IoFilterAdapter());
- builder.addFirst("C", new IoFilterAdapter());
- builder.addLast("D", new IoFilterAdapter());
- builder.addBefore("B", "E", new IoFilterAdapter());
- builder.addBefore("C", "F", new IoFilterAdapter());
- builder.addAfter("B", "G", new IoFilterAdapter());
- builder.addAfter("D", "H", new IoFilterAdapter());
+ builder.addFirst("A", new NoopFilter());
+ builder.addLast("B", new NoopFilter());
+ builder.addFirst("C", new NoopFilter());
+ builder.addLast("D", new NoopFilter());
+ builder.addBefore("B", "E", new NoopFilter());
+ builder.addBefore("C", "F", new NoopFilter());
+ builder.addAfter("B", "G", new NoopFilter());
+ builder.addAfter("D", "H", new NoopFilter());
String actual = "";
for (Entry e : builder.getAll()) {
@@ -69,10 +70,10 @@
public void testGet() throws Exception {
DefaultIoFilterChainBuilder builder = new
DefaultIoFilterChainBuilder();
- IoFilter filterA = new IoFilterAdapter();
- IoFilter filterB = new IoFilterAdapter();
- IoFilter filterC = new IoFilterAdapter();
- IoFilter filterD = new IoFilterAdapter();
+ IoFilter filterA = new NoopFilter();
+ IoFilter filterB = new NoopFilter();
+ IoFilter filterC = new NoopFilter();
+ IoFilter filterD = new NoopFilter();
builder.addFirst("A", filterA);
builder.addLast("B", filterB);
@@ -88,11 +89,11 @@
public void testRemove() throws Exception {
DefaultIoFilterChainBuilder builder = new
DefaultIoFilterChainBuilder();
- builder.addLast("A", new IoFilterAdapter());
- builder.addLast("B", new IoFilterAdapter());
- builder.addLast("C", new IoFilterAdapter());
- builder.addLast("D", new IoFilterAdapter());
- builder.addLast("E", new IoFilterAdapter());
+ builder.addLast("A", new NoopFilter());
+ builder.addLast("B", new NoopFilter());
+ builder.addLast("C", new NoopFilter());
+ builder.addLast("D", new NoopFilter());
+ builder.addLast("E", new NoopFilter());
builder.remove("A");
builder.remove("E");
@@ -106,11 +107,11 @@
public void testClear() throws Exception {
DefaultIoFilterChainBuilder builder = new
DefaultIoFilterChainBuilder();
- builder.addLast("A", new IoFilterAdapter());
- builder.addLast("B", new IoFilterAdapter());
- builder.addLast("C", new IoFilterAdapter());
- builder.addLast("D", new IoFilterAdapter());
- builder.addLast("E", new IoFilterAdapter());
+ builder.addLast("A", new NoopFilter());
+ builder.addLast("B", new NoopFilter());
+ builder.addLast("C", new NoopFilter());
+ builder.addLast("D", new NoopFilter());
+ builder.addLast("E", new NoopFilter());
builder.clear();
Modified:
mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java?rev=692090&r1=692089&r2=692090&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java
(original)
+++ mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java
Thu Sep 4 08:13:09 2008
@@ -34,6 +34,7 @@
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.write.DefaultWriteRequest;
import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.filter.util.NoopFilter;
/**
* Tests [EMAIL PROTECTED] DefaultIoFilterChain}.
@@ -117,10 +118,10 @@
}
public void testGet() throws Exception {
- IoFilter filterA = new IoFilterAdapter();
- IoFilter filterB = new IoFilterAdapter();
- IoFilter filterC = new IoFilterAdapter();
- IoFilter filterD = new IoFilterAdapter();
+ IoFilter filterA = new NoopFilter();
+ IoFilter filterB = new NoopFilter();
+ IoFilter filterC = new NoopFilter();
+ IoFilter filterD = new NoopFilter();
chain.addFirst("A", filterA);
chain.addLast("B", filterB);
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java?rev=692090&r1=692089&r2=692090&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
Thu Sep 4 08:13:09 2008
@@ -42,10 +42,7 @@
public class VmPipeEventOrderTest extends TestCase {
public void testServerToClient() throws Exception {
IoAcceptor acceptor = new VmPipeAcceptor();
- //acceptor.getFilterChain().addLast( "logger", new LoggingFilter() );
-
IoConnector connector = new VmPipeConnector();
- //connector.getFilterChain().addLast( "logger", new LoggingFilter() );
acceptor.setHandler(new IoHandlerAdapter() {
@Override
@@ -101,10 +98,7 @@
public void testClientToServer() throws Exception {
IoAcceptor acceptor = new VmPipeAcceptor();
- //acceptor.getFilterChain().addLast( "logger", new LoggingFilter() );
-
IoConnector connector = new VmPipeConnector();
- //connector.getFilterChain().addLast( "logger", new LoggingFilter() );
final StringBuffer actual = new StringBuffer();
