You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/12/03 13:59:53 UTC
git commit: ISIS-285: fixing two test errors
Updated Branches:
refs/heads/master cf8e9e213 -> 6f126b1c1
ISIS-285: fixing two test errors
* introduced as result of the new metamodel validation stuff
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6f126b1c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6f126b1c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6f126b1c
Branch: refs/heads/master
Commit: 6f126b1c1a2a63384fc61faf12750fb5280a1239
Parents: cf8e9e2
Author: Dan Haywood <da...@apache.org>
Authored: Mon Dec 3 12:59:36 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Dec 3 12:59:36 2012 +0000
----------------------------------------------------------------------
.../java/org/apache/isis/tck/dom/xmlos/Role.java | 2 +-
.../junit/sample/service/OrderRepository.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6f126b1c/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/xmlos/Role.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/xmlos/Role.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/xmlos/Role.java
index 38a735f..c9d7ee3 100644
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/xmlos/Role.java
+++ b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/xmlos/Role.java
@@ -45,7 +45,7 @@ public class Role {
public void modifyPerson(final Person person) {
setPerson(person);
}
- public void clearPerson(final Person person) {
+ public void clearPerson() {
setPerson(null);
}
// }}
http://git-wip-us.apache.org/repos/asf/isis/blob/6f126b1c/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java
----------------------------------------------------------------------
diff --git a/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java b/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java
index 12f1eb9..3249123 100644
--- a/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java
+++ b/framework/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java
@@ -59,8 +59,8 @@ public class OrderRepository extends AbstractFactoryAndRepository {
}
}
- public Object[] defaultFindRecentOrders(final Customer customer, final Integer numberOfOrders) {
- return new Object[] { null, new Integer(3) };
+ public Integer default1FindRecentOrders() {
+ return 3;
}
// }}