|
 |
7f0bec7 |
diff -Nru src/org/jmock/Expectations.java src-gil/org/jmock/Expectations.java
|
|
|
7f0bec7 |
--- src/org/jmock/Expectations.java 2012-08-13 12:22:27.031761235 +0200
|
|
|
7f0bec7 |
+++ src-gil/org/jmock/Expectations.java 2012-08-13 12:26:25.000000000 +0200
|
|
|
7f0bec7 |
@@ -143,42 +143,42 @@
|
|
|
7f0bec7 |
return null;
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
- public boolean with(Matcher<Boolean> matcher) {
|
|
|
7f0bec7 |
+ public boolean withBoolean(Matcher<Boolean> matcher) {
|
|
|
7f0bec7 |
addParameterMatcher(matcher);
|
|
|
7f0bec7 |
return false;
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
- public byte with(Matcher<Byte> matcher) {
|
|
|
7f0bec7 |
+ public byte withByte(Matcher<Byte> matcher) {
|
|
|
7f0bec7 |
addParameterMatcher(matcher);
|
|
|
7f0bec7 |
return 0;
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
- public short with(Matcher<Short> matcher) {
|
|
|
7f0bec7 |
+ public short withShort(Matcher<Short> matcher) {
|
|
|
7f0bec7 |
addParameterMatcher(matcher);
|
|
|
7f0bec7 |
return 0;
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
- public char with(Matcher<Character> matcher) {
|
|
|
7f0bec7 |
+ public char withCharacter(Matcher<Character> matcher) {
|
|
|
7f0bec7 |
addParameterMatcher(matcher);
|
|
|
7f0bec7 |
return 0;
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
- public int with(Matcher<Integer> matcher) {
|
|
|
7f0bec7 |
+ public int withInteger(Matcher<Integer> matcher) {
|
|
|
7f0bec7 |
addParameterMatcher(matcher);
|
|
|
7f0bec7 |
return 0;
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
- public long with(Matcher<Long> matcher) {
|
|
|
7f0bec7 |
+ public long withLong(Matcher<Long> matcher) {
|
|
|
7f0bec7 |
addParameterMatcher(matcher);
|
|
|
7f0bec7 |
return 0;
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
- public float with(Matcher<Float> matcher) {
|
|
|
7f0bec7 |
+ public float withFloat(Matcher<Float> matcher) {
|
|
|
7f0bec7 |
addParameterMatcher(matcher);
|
|
|
7f0bec7 |
return 0.0f;
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
- public double with(Matcher<Double> matcher) {
|
|
|
7f0bec7 |
+ public double withDouble(Matcher<Double> matcher) {
|
|
|
7f0bec7 |
addParameterMatcher(matcher);
|
|
|
7f0bec7 |
return 0.0;
|
|
|
7f0bec7 |
}
|
|
|
7f0bec7 |
diff -Nru src/org/jmock/syntax/ArgumentConstraintPhrases.java src-gil/org/jmock/syntax/ArgumentConstraintPhrases.java
|
|
|
7f0bec7 |
--- src/org/jmock/syntax/ArgumentConstraintPhrases.java 2006-10-12 16:06:01.000000000 +0200
|
|
|
7f0bec7 |
+++ src-gil/org/jmock/syntax/ArgumentConstraintPhrases.java 2012-08-13 12:27:35.000000000 +0200
|
|
|
7f0bec7 |
@@ -4,11 +4,11 @@
|
|
|
7f0bec7 |
|
|
|
7f0bec7 |
public interface ArgumentConstraintPhrases {
|
|
|
7f0bec7 |
<T> T with(Matcher<T> matcher);
|
|
|
7f0bec7 |
- boolean with(Matcher<Boolean> matcher);
|
|
|
7f0bec7 |
- byte with(Matcher<Byte> matcher);
|
|
|
7f0bec7 |
- short with(Matcher<Short> matcher);
|
|
|
7f0bec7 |
- int with(Matcher<Integer> matcher);
|
|
|
7f0bec7 |
- long with(Matcher<Long> matcher);
|
|
|
7f0bec7 |
- float with(Matcher<Float> matcher);
|
|
|
7f0bec7 |
- double with(Matcher<Double> matcher);
|
|
|
7f0bec7 |
+ boolean withBoolean(Matcher<Boolean> matcher);
|
|
|
7f0bec7 |
+ byte withByte(Matcher<Byte> matcher);
|
|
|
7f0bec7 |
+ short withShort(Matcher<Short> matcher);
|
|
|
7f0bec7 |
+ int withInteger(Matcher<Integer> matcher);
|
|
|
7f0bec7 |
+ long withLong(Matcher<Long> matcher);
|
|
|
7f0bec7 |
+ float withFloat(Matcher<Float> matcher);
|
|
|
7f0bec7 |
+ double withDouble(Matcher<Double> matcher);
|
|
|
7f0bec7 |
}
|