fixed Problem with current working bar not Updating correctly

Author: JSchraff

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -186,10 +186,21 @@ public void editProject(final Project projectToBeUpdated, final Project newValue
 
    public void editWork(final Work workToBeEdited, final Work newValuedWork) {
       LOG.info("Changing work '{}' to '{}'.", workToBeEdited, newValuedWork);
-      int index = model.getPastWorkItems().size() - 1;
-      if (model.getPastWorkItems().contains(workToBeEdited)) {
-         index = model.getPastWorkItems().indexOf(workToBeEdited);
+      Work toRemove = null;
+      for (final Work w : model.getPastWorkItems()) {
+         if (w.getId() == workToBeEdited.getId()) {
+            toRemove = w;
+            LOG.debug("changing past Work");
+         }
+      }
+
+      int index;
+      if (toRemove != null) {
+         index = model.getPastWorkItems().indexOf(toRemove);
          model.getPastWorkItems().remove(index);
+      } else {
+         // TODO sort in right Place
+         index = model.getPastWorkItems().size() - 1;
       }
 
       workToBeEdited.setCreationDate(newValuedWork.getCreationDate());

src/test/java/de/doubleslash/keeptime/controller/ControllerTest.java

@@ -16,8 +16,10 @@
 
 package de.doubleslash.keeptime.controller;
 
+import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
@@ -382,10 +384,12 @@ public void shouldNotUpdateOthersWhenWorkItemIsEdited() {
       testee.editWork(originalWork, newWork);
 
       assertThat("changed amout of WorkItems", model.getPastWorkItems().size(), equalTo(2));
+      assertThat("pastWorkItems contains work wich shouldnt be added", model.getPastWorkItems(),
+            not(contains(newWork)));
 
       final ArgumentCaptor<Work> argument = ArgumentCaptor.forClass(Work.class);
       Mockito.verify(model.getWorkRepository(), Mockito.times(1)).save(argument.capture());
-      assertThat("not saved Persistent", argument.getValue(), is(originalWork));
+      assertThat("saved other Work persistently than what should be updated", argument.getValue(), is(originalWork));
 
    }