Fix mocking of anonymous users in IsaacTest tests

I finally worked out the "right" way to do the mocking consistent with
the existing code.
Also, the existing mocks were fragile since not all endpoints must use
"getCurrentRegisteredUser", so this and "getCurrentUser" are updated
to return the right values but also be optional now.

Author: jsharkey13

src/test/java/uk/ac/cam/cl/dtg/isaac/IsaacTest.java

@@ -38,6 +38,7 @@
 import uk.ac.cam.cl.dtg.isaac.dto.ResultsWrapper;
 import uk.ac.cam.cl.dtg.isaac.dto.UserGroupDTO;
 import uk.ac.cam.cl.dtg.isaac.dto.content.QuizSummaryDTO;
+import uk.ac.cam.cl.dtg.isaac.dto.users.AnonymousUserDTO;
 import uk.ac.cam.cl.dtg.isaac.dto.users.RegisteredUserDTO;
 import uk.ac.cam.cl.dtg.isaac.dto.users.UserSummaryWithEmailAddressDTO;
 import uk.ac.cam.cl.dtg.segue.api.managers.GroupManager;
@@ -86,6 +87,7 @@ public class IsaacTest {
     protected RegisteredUserDTO secondTeacher;
     protected RegisteredUserDTO otherTeacher;
     protected RegisteredUserDTO noone;
+    protected AnonymousUserDTO anonUser;
     protected RegisteredUserDTO secondStudent;
     protected RegisteredUserDTO otherStudent;
     protected RegisteredUserDTO adminUser;
@@ -190,6 +192,7 @@ protected void initializeIsaacObjects() {
         otherTeacher.setId(++id);
 
         noone = null;
+        anonUser = new AnonymousUserDTO("fake-session-id");
 
         secondStudent = new RegisteredUserDTO("Second", "Student", "[email protected]", EmailVerificationStatus.VERIFIED, somePastDate, Gender.FEMALE, somePastDate, "", null, false);
         secondStudent.setRole(Role.STUDENT);

src/test/java/uk/ac/cam/cl/dtg/isaac/api/AbstractFacadeTest.java

@@ -31,7 +31,6 @@
 
 import jakarta.annotation.Nullable;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpSession;
 import jakarta.ws.rs.core.Request;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.Response.Status;
@@ -48,7 +47,6 @@
 import java.util.stream.Collectors;
 
 import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.anyString;
 import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.getCurrentArguments;
@@ -102,17 +100,12 @@ abstract public class AbstractFacadeTest extends IsaacTest {
 
     @Before
     public void abstractFacadeTestSetup() {
-        HttpSession session = createMock(HttpSession.class);
-        expect(session.getAttribute(anyString())).andReturn(null).anyTimes();
-        expect(session.getId()).andReturn("fake-session-id").anyTimes();
-        replay(session);
         httpServletRequest = createMock(HttpServletRequest.class);
-        expect(httpServletRequest.getSession()).andReturn(session).anyTimes();
         replay(httpServletRequest);
         request = createNiceMock(Request.class);  // We don't particularly care about what gets called on this.
         replay(request);
 
-        userManager = createPartialMock(UserAccountManager.class, "getCurrentRegisteredUser", "convertToUserSummaryObject", "getUserDTOById");
+        userManager = createPartialMock(UserAccountManager.class, "getCurrentUser", "getCurrentRegisteredUser", "convertToUserSummaryObject", "getUserDTOById");
 
         registerDefaultsFor(userManager, m -> {
             expect(m.convertToUserSummaryObject(anyObject(RegisteredUserDTO.class))).andStubAnswer(() -> {
@@ -435,9 +428,11 @@ private void runSteps(Endpoint endpoint) {
         private void runStepsAs(@Nullable RegisteredUserDTO user, Endpoint endpoint) {
             withMock(userManager, m -> {
                 if (user == null) {
-                    expect(m.getCurrentRegisteredUser(httpServletRequest)).andThrow(new NoUserLoggedInException());
+                    expect(m.getCurrentRegisteredUser(httpServletRequest)).andThrow(new NoUserLoggedInException()).anyTimes();
+                    expect(m.getCurrentUser(httpServletRequest)).andReturn(anonUser).anyTimes();
                 } else {
-                    expect(m.getCurrentRegisteredUser(httpServletRequest)).andReturn(user);
+                    expect(m.getCurrentRegisteredUser(httpServletRequest)).andReturn(user).anyTimes();
+                    expect(m.getCurrentUser(httpServletRequest)).andReturn(user).anyTimes();
                 }
             });
             currentUser = user;