OO-14: flush the history of the test to prevent returning in the test with the back/resume function

--HG--
branch : 80-patch

src/main/java/org/olat/core/gui/control/DefaultController.java

@@ -474,6 +474,10 @@ public abstract class DefaultController implements Controller, ControllerEventLi
 	protected WindowControl addToHistory(UserRequest ureq, OLATResourceable ores, StateEntry stateEntry, WindowControl wControl, boolean addToHistory) {
 		return BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ores, stateEntry, wControl, addToHistory);
 	}
+	
+	protected void removeHistory(UserRequest ureq) {
+		BusinessControlFactory.getInstance().removeFromHistory(ureq, getWindowControl());
+	}
 
 	/**
 	 * 

src/main/java/org/olat/core/id/context/BusinessControlFactory.java

@@ -209,6 +209,11 @@ public class BusinessControlFactory {
 	public void addToHistory(UserRequest ureq, HistoryPoint historyPoint) {
 		ureq.getUserSession().addToHistory(ureq, historyPoint);
 	}
+	
+	public void removeFromHistory(UserRequest ureq, WindowControl wControl) {
+		if(wControl == null || wControl.getBusinessControl() == null) return;
+		ureq.getUserSession().removeFromHistory(wControl.getBusinessControl());
+	}
 
 	public WindowControl createBusinessWindowControl(BusinessControl businessControl, WindowControl origWControl) {
 		WindowControl wc = new StackedBusinessWindowControl(origWControl, businessControl);

src/main/java/org/olat/core/util/UserSession.java

@@ -353,6 +353,16 @@ public class UserSession implements HttpSessionBindingListener, GenericEventList
 			}
 		}
 	}
+	
+	public void removeFromHistory(BusinessControl businessControl) {
+		String businessPath = businessControl.getAsString();
+		for(Iterator<HistoryPoint> it=history.iterator(); it.hasNext(); ) {
+			String path = it.next().getBusinessPath();
+			if(path.startsWith(businessPath)) {
+				it.remove();
+			}
+		}
+	}
 
 	/**
 	 * @see javax.servlet.http.HttpSessionBindingListener#valueBound(javax.servlet.http.HttpSessionBindingEvent)

src/main/java/org/olat/course/nodes/iq/IQRunController.java

@@ -515,6 +515,7 @@ public class IQRunController extends BasicController implements GenericEventList
 				} else {
 					getWindowControl().pop();
 				}	
+				removeHistory(urequest);
 				OLATResourceable ores = OresHelper.createOLATResourceableInstance("test", -1l);
 				addToHistory(urequest, ores, null);
 				if (type.equals(AssessmentInstance.QMD_ENTRY_TYPE_ASSESS) && !assessmentStopped ) {