Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mgoellnitz committed Mar 30, 2016
1 parent 27fd067 commit 1efedeb
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 8 deletions.
6 changes: 3 additions & 3 deletions editor/test/org/tangram/editor/test/EditingHandlerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ public void testList() {

Object ormClasses = request.getAttribute("classes");
Assert.assertNotNull(ormClasses, "There should be some classes list object.");
Assert.assertEquals(((Collection<?>) ormClasses).size(), 7, "Fixed number of classes in list expected.");
Assert.assertEquals(((Collection<?>) ormClasses).size(), 8, "Fixed number of classes in list expected.");
Object me = request.getAttribute(Constants.THIS);
Assert.assertNotNull(me, "There should be some instances list object..");
Assert.assertEquals(((Collection<?>) me).size(), 7, "Fixed number of instances in list expected.");
Assert.assertEquals(((Collection<?>) me).size(), 6, "Fixed number of instances in list expected.");
} // testList()


Expand Down Expand Up @@ -246,7 +246,7 @@ public void testDelete() {
Assert.assertNotNull(target.bean, "Non null result list expected after returning from deletion.");
Assert.assertEquals(target.action, null, "No action expected.");
Assert.assertEquals(target.view, "tangramEditorList", "List view expected.");
Assert.assertEquals(((Collection<?>) (target.bean)).size(), 7, "Unexpected list of contents to display.");
Assert.assertEquals(((Collection<?>) (target.bean)).size(), 6, "Unexpected list of contents to display.");
} // testDelete()


Expand Down
1 change: 0 additions & 1 deletion guicy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,4 @@ dependencies {
testCompile "org.springframework:spring-web:$versions.springframework"
testCompile "com.thoughtworks.xstream:xstream:$versions.xstream"
testCompile project (':tangram-core').sourceSets.test.output
testCompile project (':tangram-mutable').sourceSets.test.output
}
4 changes: 2 additions & 2 deletions jdo/src/tangram/jdo-defaults.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2011-2015 Martin Goellnitz
# Copyright 2011-2016 Martin Goellnitz
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
Expand All @@ -14,6 +14,6 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
bean.factory.application.base.package=org.tangram
bean.factory.application.base.package=de
bean.factory.activate.caching=true
bean.factory.activate.query.caching=false
4 changes: 2 additions & 2 deletions nucleus/test/org/tangram/nucleus/test/NucleusContentTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ protected void setPeers(BaseInterface base, SubInterface peer) {

@Override
protected int getNumberOfAllClasses() {
return 23;
return 6;
}


@Override
protected int getNumberOfClasses() {
return 10;
return 4;
}


Expand Down
17 changes: 17 additions & 0 deletions nucleus/test/tangram/nucleus-test.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#
# Copyright 2016 Martin Goellnitz
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
bean.factory.application.base.package=org.tangram.mutable.test

0 comments on commit 1efedeb

Please sign in to comment.