Author: jcarman
Date: Sat Aug 3 15:05:58 2013
New Revision: 1510005
URL: http://svn.apache.org/r1510005
Log:
Adding tests for ArgumentMatcherUtils.
Added:
commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/interceptor/matcher/argument/
commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtilsTest.java
Modified:
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/ArgumentMatcher.java
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
Modified:
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/ArgumentMatcher.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/ArgumentMatcher.java?rev=1510005&r1=1510004&r2=1510005&view=diff
==============================================================================
---
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/ArgumentMatcher.java
(original)
+++
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/ArgumentMatcher.java
Sat Aug 3 15:05:58 2013
@@ -17,11 +17,11 @@
package org.apache.commons.proxy2.interceptor.matcher;
-public interface ArgumentMatcher
+public interface ArgumentMatcher<T>
{
//----------------------------------------------------------------------------------------------------------------------
// Other Methods
//----------------------------------------------------------------------------------------------------------------------
- boolean matches(Object argument);
+ boolean matches(T argument);
}
Modified:
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java?rev=1510005&r1=1510004&r2=1510005&view=diff
==============================================================================
---
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
(original)
+++
commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
Sat Aug 3 15:05:58 2013
@@ -1,6 +1,24 @@
+/*
+ * 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.commons.proxy2.interceptor.matcher.argument;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.Validate;
import org.apache.commons.proxy2.interceptor.matcher.ArgumentMatcher;
public final class ArgumentMatcherUtils
@@ -9,34 +27,64 @@ public final class ArgumentMatcherUtils
// Static Methods
//----------------------------------------------------------------------------------------------------------------------
- public static ArgumentMatcher any()
+ public static ArgumentMatcher<Object> any()
{
return new AnyMatcher();
}
- public static ArgumentMatcher eq(final Object value)
+ public static ArgumentMatcher<String> endsWith(String suffix)
+ {
+ return new EndsWithMatcher(Validate.notNull(suffix));
+ }
+
+ public static <T> ArgumentMatcher<T> eq(final T value)
+ {
+ return new EqualsMatcher<T>(value);
+ }
+
+ public static <C extends Comparable> ArgumentMatcher<C> gt(C comparable)
+ {
+ return new GreaterThanMatcher<C>(comparable);
+ }
+
+ public static <C extends Comparable> ArgumentMatcher<C> gte(C comparable)
{
- return new EqualsMatcher(value);
+ return new GreaterThanOrEqualMatcher<C>(comparable);
}
- public static ArgumentMatcher isA(final Class<?> type)
+ public static ArgumentMatcher<Object> isA(final Class<?> type)
{
return new InstanceOfMatcher(type);
}
- public static ArgumentMatcher isNull()
+ public static ArgumentMatcher<Object> isNull()
{
return new IsNullMatcher();
}
- public static ArgumentMatcher notNull()
+ public static <C extends Comparable> ArgumentMatcher<C> lt(C comparable)
{
- return new NotNullMatcher();
+ return new LessThanMatcher<C>(comparable);
}
- public static ArgumentMatcher same(final Object ref)
+ public static <C extends Comparable> ArgumentMatcher<C> lte(C comparable)
{
- return new SameMatcher(ref);
+ return new LessThanOrEqualMatcher<C>(comparable);
+ }
+
+ public static ArgumentMatcher<String> matches(String regex)
+ {
+ return new RegexMatcher(Validate.notNull(regex));
+ }
+
+ public static <T> ArgumentMatcher<T> notNull()
+ {
+ return new NotNullMatcher<T>();
+ }
+
+ public static ArgumentMatcher<String> startsWith(String prefix)
+ {
+ return new StartsWithMatcher(Validate.notNull(prefix));
}
//----------------------------------------------------------------------------------------------------------------------
@@ -45,14 +93,14 @@ public final class ArgumentMatcherUtils
private ArgumentMatcherUtils()
{
-
+
}
//----------------------------------------------------------------------------------------------------------------------
// Inner Classes
//----------------------------------------------------------------------------------------------------------------------
- private static class AnyMatcher implements ArgumentMatcher
+ private static class AnyMatcher implements ArgumentMatcher<Object>
{
@Override
public boolean matches(Object argument)
@@ -61,23 +109,90 @@ public final class ArgumentMatcherUtils
}
}
- private static class EqualsMatcher implements ArgumentMatcher
+ private abstract static class ComparatorMatcher<C extends Comparable>
implements ArgumentMatcher<C>
{
- private final Object value;
+ private final C comparable;
- public EqualsMatcher(Object value)
+ protected ComparatorMatcher(C comparable)
+ {
+ this.comparable = Validate.notNull(comparable);
+ }
+
+ protected abstract boolean evaluate(int comparison);
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public boolean matches(C argument)
+ {
+ if(argument == null)
+ {
+ return false;
+ }
+ return evaluate(comparable.compareTo(argument));
+ }
+ }
+
+ public static class EndsWithMatcher implements ArgumentMatcher<String>
+ {
+ private final String suffix;
+
+ public EndsWithMatcher(String suffix)
+ {
+ this.suffix = suffix;
+ }
+
+ @Override
+ public boolean matches(String argument)
+ {
+ return argument != null && argument.endsWith(suffix);
+ }
+ }
+
+ private static class EqualsMatcher<T> implements ArgumentMatcher<T>
+ {
+ private final T value;
+
+ public EqualsMatcher(T value)
{
this.value = value;
}
@Override
- public boolean matches(Object argument)
+ public boolean matches(T argument)
{
return ObjectUtils.equals(argument, value);
}
}
- private static class InstanceOfMatcher implements ArgumentMatcher
+ private static class GreaterThanMatcher<C extends Comparable> extends
ComparatorMatcher<C>
+ {
+ private GreaterThanMatcher(C comparable)
+ {
+ super(comparable);
+ }
+
+ @Override
+ protected boolean evaluate(int comparison)
+ {
+ return comparison < 0;
+ }
+ }
+
+ private static class GreaterThanOrEqualMatcher<C extends Comparable>
extends ComparatorMatcher<C>
+ {
+ private GreaterThanOrEqualMatcher(C comparable)
+ {
+ super(comparable);
+ }
+
+ @Override
+ protected boolean evaluate(int comparison)
+ {
+ return comparison <= 0;
+ }
+ }
+
+ private static class InstanceOfMatcher implements ArgumentMatcher<Object>
{
private final Class<?> type;
@@ -93,7 +208,7 @@ public final class ArgumentMatcherUtils
}
}
- private static class IsNullMatcher implements ArgumentMatcher
+ private static class IsNullMatcher implements ArgumentMatcher<Object>
{
@Override
public boolean matches(Object argument)
@@ -102,28 +217,72 @@ public final class ArgumentMatcherUtils
}
}
- private static class NotNullMatcher implements ArgumentMatcher
+ private static class LessThanMatcher<C extends Comparable> extends
ComparatorMatcher<C>
{
+ private LessThanMatcher(C comparable)
+ {
+ super(comparable);
+ }
+
@Override
- public boolean matches(Object argument)
+ protected boolean evaluate(int comparison)
+ {
+ return comparison > 0;
+ }
+ }
+
+ private static class LessThanOrEqualMatcher<C extends Comparable> extends
ComparatorMatcher<C>
+ {
+ private LessThanOrEqualMatcher(C comparable)
+ {
+ super(comparable);
+ }
+
+ @Override
+ protected boolean evaluate(int comparison)
+ {
+ return comparison >= 0;
+ }
+ }
+
+ private static class NotNullMatcher<T> implements ArgumentMatcher<T>
+ {
+ @Override
+ public boolean matches(T argument)
{
return argument != null;
}
}
- private static class SameMatcher implements ArgumentMatcher
+ public static class RegexMatcher implements ArgumentMatcher<String>
{
- private final Object ref;
+ private final String regex;
- public SameMatcher(Object ref)
+ public RegexMatcher(String regex)
{
- this.ref = ref;
+ this.regex = regex;
}
@Override
- public boolean matches(Object argument)
+ public boolean matches(String argument)
+ {
+ return argument != null && argument.matches(regex);
+ }
+ }
+
+ private static class StartsWithMatcher implements ArgumentMatcher<String>
+ {
+ private final String prefix;
+
+ private StartsWithMatcher(String prefix)
+ {
+ this.prefix = prefix;
+ }
+
+ @Override
+ public boolean matches(String argument)
{
- return argument == ref;
+ return argument != null && argument.startsWith(prefix);
}
}
}
Added:
commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtilsTest.java?rev=1510005&view=auto
==============================================================================
---
commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtilsTest.java
(added)
+++
commons/proper/proxy/branches/version-2.0-work/core/src/test/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtilsTest.java
Sat Aug 3 15:05:58 2013
@@ -0,0 +1,139 @@
+/*
+ * 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.commons.proxy2.interceptor.matcher.argument;
+
+import org.apache.commons.proxy2.interceptor.matcher.ArgumentMatcher;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ArgumentMatcherUtilsTest
+{
+ @Test
+ public void testAny() throws Exception
+ {
+ ArgumentMatcher<Object> matcher =ArgumentMatcherUtils.any();
+ assertTrue(matcher.matches(null));
+ assertTrue(matcher.matches("Hello!"));
+ assertTrue(matcher.matches(12345));
+ }
+
+ @Test
+ public void testEq() throws Exception
+ {
+ ArgumentMatcher<String> matcher = ArgumentMatcherUtils.eq("Hello");
+ assertTrue(matcher.matches("Hello"));
+ assertFalse(matcher.matches(null));
+ }
+
+ @Test
+ public void testGt() throws Exception
+ {
+ ArgumentMatcher<Integer> matcher = ArgumentMatcherUtils.gt(5);
+ assertTrue(matcher.matches(6));
+ assertFalse(matcher.matches(5));
+ assertFalse(matcher.matches(1));
+ assertFalse(matcher.matches(null));
+ }
+
+ @Test
+ public void testGte() throws Exception
+ {
+ ArgumentMatcher<Integer> matcher = ArgumentMatcherUtils.gte(5);
+ assertTrue(matcher.matches(6));
+ assertTrue(matcher.matches(5));
+ assertFalse(matcher.matches(1));
+ assertFalse(matcher.matches(null));
+ }
+
+ @Test
+ public void testIsA() throws Exception
+ {
+ ArgumentMatcher<Object> matcher =
ArgumentMatcherUtils.isA(String.class);
+ assertFalse(matcher.matches(null));
+ assertTrue(matcher.matches("Hello"));
+ assertFalse(matcher.matches(123));
+ }
+
+ @Test
+ public void testIsNull() throws Exception
+ {
+ ArgumentMatcher<Object> matcher = ArgumentMatcherUtils.isNull();
+ assertTrue(matcher.matches(null));
+ assertFalse(matcher.matches("Hello"));
+ assertFalse(matcher.matches(123));
+ }
+
+ @Test
+ public void testLt() throws Exception
+ {
+ ArgumentMatcher<Integer> matcher = ArgumentMatcherUtils.lt(5);
+ assertTrue(matcher.matches(4));
+ assertFalse(matcher.matches(5));
+ assertFalse(matcher.matches(19));
+ assertFalse(matcher.matches(null));
+ }
+
+ @Test
+ public void testLte() throws Exception
+ {
+ ArgumentMatcher<Integer> matcher = ArgumentMatcherUtils.lte(5);
+ assertTrue(matcher.matches(4));
+ assertTrue(matcher.matches(5));
+ assertFalse(matcher.matches(19));
+ assertFalse(matcher.matches(null));
+ }
+
+ @Test
+ public void testMatches() throws Exception
+ {
+ ArgumentMatcher<String> matcher =
ArgumentMatcherUtils.matches("(abc)+");
+ assertTrue(matcher.matches("abc"));
+ assertTrue(matcher.matches("abcabc"));
+ assertFalse(matcher.matches(""));
+ assertFalse(matcher.matches(null));
+ }
+
+ @Test
+ public void testNotNull() throws Exception
+ {
+ ArgumentMatcher<String> matcher = ArgumentMatcherUtils.notNull();
+ assertTrue(matcher.matches("Hello"));
+ assertFalse(matcher.matches(null));
+ }
+
+ @Test
+ public void testStartsWith() throws Exception
+ {
+ ArgumentMatcher<String> matcher =
ArgumentMatcherUtils.startsWith("abc");
+ assertTrue(matcher.matches("abc"));
+ assertTrue(matcher.matches("abcd"));
+ assertFalse(matcher.matches("ab"));
+ assertFalse(matcher.matches(null));
+ }
+
+ @Test
+ public void testEndsWith() throws Exception
+ {
+ ArgumentMatcher<String> matcher = ArgumentMatcherUtils.endsWith("abc");
+ assertTrue(matcher.matches("abc"));
+ assertTrue(matcher.matches("dabc"));
+ assertFalse(matcher.matches("ab"));
+ assertFalse(matcher.matches(null));
+ }
+}
