From 68bc4a6fa573e088d859424d7386b596c5b0a8fd Mon Sep 17 00:00:00 2001 From: Vova Perebykivskyi Date: Thu, 5 May 2016 11:38:57 +0300 Subject: [PATCH] Update Slf4j. Code refactoring. --- .../main/java/org/zkoss/ganttz/TaskRow.java | 1 + .../main/resources/metainfo/zk/lang-addon.xml | 6 +- .../resources/web/js/ganttz/TimeTracker.js | 54 +++-- .../ganttz/util/MutableTreeModelTest.java | 209 +++++++++--------- libreplan-business/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 140 insertions(+), 134 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskRow.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskRow.java index 6ceec6207..8c102963e 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskRow.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskRow.java @@ -31,6 +31,7 @@ public class TaskRow extends XulElement { public static T wrapInRow(T taskComponent) { TaskRow parent = new TaskRow(); parent.appendChild(taskComponent); + return taskComponent; } diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml index 625c4d6dc..fcca06ce0 100755 --- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml +++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml @@ -6,9 +6,9 @@ - - - + + + zul xul diff --git a/ganttzk/src/main/resources/web/js/ganttz/TimeTracker.js b/ganttzk/src/main/resources/web/js/ganttz/TimeTracker.js index 1b71bbce1..5f585026d 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/TimeTracker.js +++ b/ganttzk/src/main/resources/web/js/ganttz/TimeTracker.js @@ -1,26 +1,34 @@ zk.$package("ganttz"); -ganttz.TimeTracker = zk.$extends(zk.Macro,{ - $init : function(){ - this.$supers('$init', arguments); - this.$class.setInstance(this); +ganttz.TimeTracker = zk.$extends( + + zk.Macro,{ + $init : function(){ + this.$supers('$init', arguments); + this.$class.setInstance(this); + }, + + bind_ : function (){ + this.$supers('bind_', arguments); + this._timetrackerGap = jq('.timetrackergap'); + this._timetrackerHeader = jq('#timetrackerheader .z-vbox'); + }, + + realWidth : function(){ + return this._timetrackerHeader.width(); + }, + + scrollLeft : function(ammount){ + this._timetrackerGap.css({left : -ammount}); + } }, - bind_ : function (){ - this.$supers('bind_', arguments); - this._timetrackerGap = jq('.timetrackergap'); - this._timetrackerHeader = jq('#timetrackerheader .z-vbox'); - }, - realWidth : function(){ - return this._timetrackerHeader.width(); - }, - scrollLeft : function(ammount){ - this._timetrackerGap.css({left : -ammount}); - } -},{ - getInstance : function(){ - return this._instance; - }, - setInstance : function(instance){ - this._instance = instance; - } -}) \ No newline at end of file + + { + getInstance : function(){ + return this._instance; + }, + + setInstance : function(instance){ + this._instance = instance; + } + }) \ No newline at end of file diff --git a/ganttzk/src/test/java/org/zkoss/ganttz/util/MutableTreeModelTest.java b/ganttzk/src/test/java/org/zkoss/ganttz/util/MutableTreeModelTest.java index 4addd6c25..60404fd15 100644 --- a/ganttzk/src/test/java/org/zkoss/ganttz/util/MutableTreeModelTest.java +++ b/ganttzk/src/test/java/org/zkoss/ganttz/util/MutableTreeModelTest.java @@ -56,6 +56,7 @@ public class MutableTreeModelTest { @Test public void aMutableTreeModelCanBeCreatedPassingType() { MutableTreeModel model = MutableTreeModel.create(Prueba.class); + assertNotNull(model); assertNull(model.getRoot()); } @@ -63,8 +64,8 @@ public class MutableTreeModelTest { @Test public void aMutableTreeModelCanBeCreatedPassingTypeAndRootObject() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); + assertNotNull(model); assertThat(model.getRoot(), equalTo(root)); } @@ -72,12 +73,12 @@ public class MutableTreeModelTest { @Test public void childrenCanBeAdded() { Prueba prueba = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - prueba); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, prueba); Prueba other = new Prueba(); model.add(model.getRoot(), other); Prueba otherChild = new Prueba(); model.addToRoot(otherChild); + assertThat(model.getChildCount(model.getRoot()), equalTo(2)); assertThat(model.getChild(model.getRoot(), 0), equalTo(other)); assertThat(model.getChild(model.getRoot(), 1), equalTo(otherChild)); @@ -86,10 +87,10 @@ public class MutableTreeModelTest { @Test public void testLeaf() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); Prueba other = new Prueba(); model.add(model.getRoot(), other); + assertTrue(model.isLeaf(other)); assertFalse(model.isLeaf(root)); } @@ -97,11 +98,11 @@ public class MutableTreeModelTest { @Test public void childAddedCanBeFoundUsingGetPath() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); Prueba child = new Prueba(); model.add(root, child); int[] path = model.getPath(model.getRoot(), child); + assertThat(path.length, equalTo(1)); assertThat(path[0], equalTo(0)); } @@ -109,42 +110,42 @@ public class MutableTreeModelTest { @Test public void getPathReturnsEmptyArrayWhenParentNotFound() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); Prueba child = new Prueba(); model.add(root, child); + assertThat(model.getPath(null, child), equalTo(new int[0])); } @Test public void getPathReturnsEmptyArrayWhenChildNotFound() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); Prueba child = new Prueba(); model.add(root, child); + assertThat(model.getPath(root, new Prueba()), equalTo(new int[0])); } @Test public void ifThereisNotPathReturnEmptyArray() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); Prueba child = new Prueba(); model.add(root, child); + assertThat(model.getPath(child, root), equalTo(new int[0])); } @Test public void hasMethodGetParentToMakeNavigationEasier() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); Prueba child = new Prueba(); model.add(root, child); Prueba grandChild = new Prueba(); model.add(child, grandChild); + assertThat(model.getParent(grandChild), equalTo(child)); assertThat(model.getParent(child), equalTo(root)); } @@ -152,13 +153,13 @@ public class MutableTreeModelTest { @Test public void hasMethodGetAllParentsUntilRoot() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); Prueba child = new Prueba(); model.add(root, child); Prueba grandChild = new Prueba(); model.add(child, grandChild); List parents = model.getParents(grandChild); + assertThat(parents.size(), equalTo(2)); assertThat(parents, equalTo(Arrays.asList(child, root))); } @@ -166,16 +167,14 @@ public class MutableTreeModelTest { @Test(expected = IllegalArgumentException.class) public void findObjectAtInvalidPath() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); model.findObjectAt(0, 1); } @Test(expected = IllegalArgumentException.class) public void findObjectAtInvalidPathInTheMiddle() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); Prueba p1 = new Prueba(); model.addToRoot(p1); model.addToRoot(new Prueba()); @@ -186,8 +185,7 @@ public class MutableTreeModelTest { @Test public void findAtPathCanReceiveGetPathResult() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); assertTrue(canBeRetrievedWithGetPath(model, model.getRoot())); model.addToRoot(new Prueba()); Prueba p2 = new Prueba(); @@ -195,55 +193,54 @@ public class MutableTreeModelTest { assertTrue(canBeRetrievedWithGetPath(model, p2)); Prueba grandChild = new Prueba(); model.add(p2, grandChild); + assertTrue(canBeRetrievedWithGetPath(model, grandChild)); } - private static boolean canBeRetrievedWithGetPath( - final MutableTreeModel tree, T object) { + private static boolean canBeRetrievedWithGetPath(final MutableTreeModel tree, T object) { int[] path = tree.getPath(object); + return tree.findObjectAt(path).equals(object); } @Test(expected = IllegalArgumentException.class) public void getParentOfRootThrowsException() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); model.getParent(root); } @Test public void addingTriggersEvent() { MutableTreeModel model = MutableTreeModel.create(Prueba.class); - final ArrayList eventsFired = new ArrayList(); - model.addTreeDataListener(new TreeDataListener() { + final ArrayList eventsFired = new ArrayList<>(); + model.addTreeDataListener(new TreeDataListener() { @Override public void onChange(TreeDataEvent event) { eventsFired.add(event); } }); + Prueba child1 = new Prueba(); Prueba child2 = new Prueba(); Prueba granChildren1 = new Prueba(); model.add(model.getRoot(), child1); - checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, model - .getRoot(), 0); + checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, model.getRoot(), 0); model.add(model.getRoot(), child2); - checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, model - .getRoot(), 1); + checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, model.getRoot(), 1); model.add(child1, granChildren1); - checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, - child1, 0); + checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, child1, 0); + assertThat(eventsFired.size(), equalTo(3)); } @Test public void canAddSeveral() { MutableTreeModel model = MutableTreeModel.create(Prueba.class); - final ArrayList eventsFired = new ArrayList(); - model.addTreeDataListener(new TreeDataListener() { + final ArrayList eventsFired = new ArrayList<>(); + model.addTreeDataListener(new TreeDataListener() { @Override public void onChange(TreeDataEvent event) { eventsFired.add(event); @@ -253,7 +250,9 @@ public class MutableTreeModelTest { Prueba child1 = new Prueba(); Prueba child2 = new Prueba(); model.add(model.getRoot(), Arrays.asList(child1, child2)); + assertThat(eventsFired.size(), equalTo(1)); + TreeDataEvent event = getLast(eventsFired); checkIsValid(event, TreeDataEvent.INTERVAL_ADDED, model.getRoot(), 0, 1); } @@ -266,6 +265,7 @@ public class MutableTreeModelTest { Prueba p2 = new Prueba(); Prueba p3 = new Prueba(); model.add(model.getRoot(), 0, Arrays.asList(p2, p3)); + assertThat(model.getChild(model.getRoot(), 0), equalTo(p2)); assertThat(model.getChild(model.getRoot(), 1), equalTo(p3)); assertThat(model.getChild(model.getRoot(), 2), equalTo(p1)); @@ -276,17 +276,16 @@ public class MutableTreeModelTest { MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba p1 = new Prueba(); model.add(model.getRoot(), p1); - final ArrayList eventsFired = new ArrayList(); - model.addTreeDataListener(new TreeDataListener() { + final ArrayList eventsFired = new ArrayList<>(); + model.addTreeDataListener(new TreeDataListener() { @Override public void onChange(TreeDataEvent event) { eventsFired.add(event); } }); - model - .add(model.getRoot(), 0, Arrays.asList(new Prueba(), - new Prueba())); + + model.add(model.getRoot(), 0, Arrays.asList(new Prueba(), new Prueba())); TreeDataEvent event = getLast(eventsFired); checkIsValid(event, TreeDataEvent.INTERVAL_ADDED, model.getRoot(), 0, 1); } @@ -297,21 +296,24 @@ public class MutableTreeModelTest { Prueba child1 = new Prueba(); Prueba child2 = new Prueba(); model.add(model.getRoot(), Arrays.asList(child1, child2)); + assertThat(model.getChildCount(model.getRoot()), equalTo(2)); } @Test public void addingAnEmptyListOfElementsDontDoNothing() { MutableTreeModel model = MutableTreeModel.create(Prueba.class); - final List events = new ArrayList(); - model.addTreeDataListener(new TreeDataListener() { + final List events = new ArrayList<>(); + model.addTreeDataListener(new TreeDataListener() { @Override public void onChange(TreeDataEvent event) { events.add(event); } }); + model.add(model.getRoot(), new ArrayList()); + assertThat(events.size(), equalTo(0)); } @@ -321,19 +323,17 @@ public class MutableTreeModelTest { final Prueba newlyAdded = new Prueba(); final Prueba child1 = new Prueba(); final Prueba child2 = new Prueba(); - model.add(model.getRoot(), Collections.singletonList(newlyAdded), - childrenFor(newlyAdded, child1, child2)); + model.add(model.getRoot(), Collections.singletonList(newlyAdded), childrenFor(newlyAdded, child1, child2)); + assertThat(model.getChild(model.getRoot(), 0), equalTo(newlyAdded)); assertThat(model.getChildCount(newlyAdded), equalTo(2)); } - private IChildrenExtractor childrenFor(final Prueba parent, - final Prueba... children) { + private IChildrenExtractor childrenFor(final Prueba parent, final Prueba... children) { return new IChildrenExtractor() { - @Override public List getChildren(Prueba p) { - if (parent == p) { + if ( parent == p ) { return Arrays.asList(children); } else { return Collections.emptyList(); @@ -348,16 +348,17 @@ public class MutableTreeModelTest { final Prueba newlyAdded = new Prueba(); final Prueba child1 = new Prueba(); final Prueba child2 = new Prueba(); - final List eventsFired = new ArrayList(); - model.addTreeDataListener(new TreeDataListener() { + final List eventsFired = new ArrayList<>(); + model.addTreeDataListener(new TreeDataListener() { @Override public void onChange(TreeDataEvent event) { eventsFired.add(event); } }); - model.add(model.getRoot(), Collections.singletonList(newlyAdded), - childrenFor(newlyAdded, child1, child2)); + + model.add(model.getRoot(), Collections.singletonList(newlyAdded), childrenFor(newlyAdded, child1, child2)); + assertThat(eventsFired.size(), equalTo(1)); } @@ -367,14 +368,14 @@ public class MutableTreeModelTest { Prueba prueba1 = new Prueba(); model.add(model.getRoot(), prueba1); model.remove(prueba1); + assertThat(model.getChildCount(model.getRoot()), equalTo(0)); } @Test(expected = IllegalArgumentException.class) public void theRootNodeCannotBeRemoved() { Prueba root = new Prueba(); - MutableTreeModel model = MutableTreeModel.create(Prueba.class, - root); + MutableTreeModel model = MutableTreeModel.create(Prueba.class, root); model.remove(root); } @@ -386,23 +387,24 @@ public class MutableTreeModelTest { Prueba grandson = new Prueba(); model.add(parent, grandson); model.remove(parent); + assertThat(model.getPath(parent, grandson).length, equalTo(0)); } @Test public void removingANodeTriggersEvent() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); - final List removeEventsFired = new ArrayList(); - model.addTreeDataListener(new TreeDataListener() { + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); + final List removeEventsFired = new ArrayList<>(); + model.addTreeDataListener(new TreeDataListener() { @Override public void onChange(TreeDataEvent event) { - if (event.getType() == TreeDataEvent.INTERVAL_REMOVED) { + if ( event.getType() == TreeDataEvent.INTERVAL_REMOVED ) { removeEventsFired.add(event); } } }); + Prueba prueba1 = new Prueba(); Prueba prueba2 = new Prueba(); Prueba grandChild = new Prueba(); @@ -411,26 +413,27 @@ public class MutableTreeModelTest { model.add(prueba1, grandChild); model.remove(grandChild); + assertThat(removeEventsFired.size(), equalTo(1)); - checkIsValid(getLast(removeEventsFired), - TreeDataEvent.INTERVAL_REMOVED, prueba1, 0); + + checkIsValid(getLast(removeEventsFired), TreeDataEvent.INTERVAL_REMOVED, prueba1, 0); model.remove(prueba2); - assertThat(getLast(removeEventsFired).getParent(), - equalTo((Object) model.getRoot())); - checkIsValid(getLast(removeEventsFired), - TreeDataEvent.INTERVAL_REMOVED, model.getRoot(), 1); + + assertThat(getLast(removeEventsFired).getParent(), equalTo((Object) model.getRoot())); + + checkIsValid(getLast(removeEventsFired), TreeDataEvent.INTERVAL_REMOVED, model.getRoot(), 1); model.remove(prueba1); + assertThat(removeEventsFired.size(), equalTo(3)); - checkIsValid(getLast(removeEventsFired), - TreeDataEvent.INTERVAL_REMOVED, model.getRoot(), 0); + + checkIsValid(getLast(removeEventsFired), TreeDataEvent.INTERVAL_REMOVED, model.getRoot(), 0); } @Test public void aNodeCanBeReplacedByOther() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba toRemove = new Prueba(); Prueba prueba2 = new Prueba(); Prueba grandChild = new Prueba(); @@ -446,8 +449,7 @@ public class MutableTreeModelTest { @Test public void aNodeCanBeMovedDown() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba prueba1 = new Prueba(); model.addToRoot(prueba1); Prueba prueba2 = new Prueba(); @@ -455,6 +457,7 @@ public class MutableTreeModelTest { Prueba prueba3 = new Prueba(); model.addToRoot(prueba3); model.down(prueba1); + assertThat(model.getChild(model.getRoot(), 0), equalTo(prueba2)); assertThat(model.getChild(model.getRoot(), 1), equalTo(prueba1)); assertThat(model.getChild(model.getRoot(), 2), equalTo(prueba3)); @@ -462,8 +465,7 @@ public class MutableTreeModelTest { @Test public void aNodeCanBeMovedUp() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba prueba1 = new Prueba(); model.addToRoot(prueba1); Prueba prueba2 = new Prueba(); @@ -471,6 +473,7 @@ public class MutableTreeModelTest { Prueba prueba3 = new Prueba(); model.addToRoot(prueba3); model.up(prueba2); + assertThat(model.getChild(model.getRoot(), 0), equalTo(prueba2)); assertThat(model.getChild(model.getRoot(), 1), equalTo(prueba1)); assertThat(model.getChild(model.getRoot(), 2), equalTo(prueba3)); @@ -478,8 +481,7 @@ public class MutableTreeModelTest { @Test public void IfItIsAtTheTopUpDoesNothing() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba prueba1 = new Prueba(); model.addToRoot(prueba1); Prueba prueba2 = new Prueba(); @@ -487,6 +489,7 @@ public class MutableTreeModelTest { Prueba prueba3 = new Prueba(); model.addToRoot(prueba3); model.up(prueba1); + assertThat(model.getChild(model.getRoot(), 0), equalTo(prueba1)); assertThat(model.getChild(model.getRoot(), 1), equalTo(prueba2)); assertThat(model.getChild(model.getRoot(), 2), equalTo(prueba3)); @@ -494,50 +497,45 @@ public class MutableTreeModelTest { @Test public void movingUpAndDownSendsRemovalAndAddingEventsSoZKReloadsCorrectlyTheData() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba prueba1 = new Prueba(); model.addToRoot(prueba1); Prueba prueba2 = new Prueba(); model.addToRoot(prueba2); Prueba prueba3 = new Prueba(); model.addToRoot(prueba3); - final ArrayList eventsFired = new ArrayList(); - model.addTreeDataListener(new TreeDataListener() { + final ArrayList eventsFired = new ArrayList<>(); + model.addTreeDataListener(new TreeDataListener() { @Override public void onChange(TreeDataEvent event) { eventsFired.add(event); } }); + model.up(prueba2); - checkIsValid(getPreviousToLast(eventsFired), - TreeDataEvent.INTERVAL_REMOVED, model.getRoot(), 0, 1); - checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, - model.getRoot(), 0, 1); + checkIsValid(getPreviousToLast(eventsFired), TreeDataEvent.INTERVAL_REMOVED, model.getRoot(), 0, 1); + checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, model.getRoot(), 0, 1); model.down(prueba1); - checkIsValid(getPreviousToLast(eventsFired), - TreeDataEvent.INTERVAL_REMOVED, model.getRoot(), 1, 2); - checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, - model.getRoot(), 1, 2); + checkIsValid(getPreviousToLast(eventsFired), TreeDataEvent.INTERVAL_REMOVED, model.getRoot(), 1, 2); + checkIsValid(getLast(eventsFired), TreeDataEvent.INTERVAL_ADDED, model.getRoot(), 1, 2); } @Test public void ifItIsAtTheBottomDownDoesNothing() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba prueba1 = new Prueba(); model.addToRoot(prueba1); Prueba prueba2 = new Prueba(); model.addToRoot(prueba2); model.down(prueba2); + assertThat(model.getChild(model.getRoot(), 1), equalTo(prueba2)); } @Test public void canBeKnownIfAnEntityIsOnTheTree() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba prueba1 = new Prueba(); model.addToRoot(prueba1); @@ -548,36 +546,34 @@ public class MutableTreeModelTest { @Test public void treeParentContainsChild() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba parent = new Prueba(); model.addToRoot(parent); Prueba child = new Prueba(); model.add(parent, child); + assertTrue(model.contains(parent, child)); } @Test public void treeParentDoesNotContainChild() { - final MutableTreeModel model = MutableTreeModel - .create(Prueba.class); + final MutableTreeModel model = MutableTreeModel.create(Prueba.class); Prueba parent = new Prueba(); model.addToRoot(parent); Prueba child = new Prueba(); + assertFalse(model.contains(parent, child)); } - private void checkIsValid(TreeDataEvent event, int type, - Prueba expectedParent, int expectedPosition) { - checkIsValid(event, type, expectedParent, expectedPosition, - expectedPosition); + private void checkIsValid(TreeDataEvent event, int type, Prueba expectedParent, int expectedPosition) { + checkIsValid(event, type, expectedParent, expectedPosition, expectedPosition); } - private void checkIsValid(TreeDataEvent event, int type, - Prueba expectedParent, int expectedFromPosition, - int expectedToPosition) { + private void checkIsValid( + TreeDataEvent event, int type, Prueba expectedParent, int expectedFromPosition, int expectedToPosition) { + assertEquals(expectedParent, event.getParent()); assertThat(event.getIndexFrom(), equalTo(expectedFromPosition)); assertThat(event.getIndexTo(), equalTo(expectedToPosition)); @@ -589,9 +585,10 @@ public class MutableTreeModelTest { } private TreeDataEvent getLast(List list) { - if (list.isEmpty()) { + if ( list.isEmpty() ) { throw new RuntimeException("no events"); } + return list.get(list.size() - 1); } diff --git a/libreplan-business/pom.xml b/libreplan-business/pom.xml index 9a28b28ce..7ef6d1632 100644 --- a/libreplan-business/pom.xml +++ b/libreplan-business/pom.xml @@ -110,7 +110,7 @@ commons-math3 - + org.slf4j slf4j-log4j12 diff --git a/pom.xml b/pom.xml index ac0de7fba..7fe06aa7b 100644 --- a/pom.xml +++ b/pom.xml @@ -420,7 +420,7 @@ org.slf4j slf4j-api - 1.7.7 + 1.7.21