private static final SprintfCommand sp = new SprintfCommand("Logged in as {0} via {1}.", Arrays.asList("${username", "${loginMethod"));
- private static final SprintfCommand inner = new SprintfCommand("{0} (on behalf of {1})", Arrays.asList("${user", "${target"));
+ private static final SprintfCommand inner = new SprintfCommand("{0}, acting as {1},", Arrays.asList("${user", "${target"));
@Override
public void output(PrintWriter out, Language l, Map<String, Object> vars) {
@Override
public void output(PrintWriter out, Language l, Map<String, Object> vars) {
if (target != actor) {
- vars.put("user", ((Organisation) target).getName().toString());
- vars.put("target", actor.getPreferredName().toString());
+ vars.put("target", ((Organisation) target).getName().toString());
+ vars.put("user", actor.getPreferredName().toString());
inner.output(out, l, vars);
} else {
out.println(actor.getPreferredName().toString());
assertNull(executeBasicWebInteraction(cookie, SwitchOrganisation.PATH, "org:" + org1.getId() + "=y", 0));
String res = IOUtils.readURL(get(SwitchOrganisation.PATH));
- assertThat(res, containsString("Logged in as " + org1.getName() + " (on behalf of " + u2.getPreferredName()));
+ assertThat(res, containsString("Logged in as " + u2.getPreferredName() + ", acting as " + org1.getName()));
}
assertNull(executeBasicWebInteraction(cookie, SwitchOrganisation.PATH, "org:" + org2.getId() + "=y", 0));
String res = IOUtils.readURL(get(SwitchOrganisation.PATH));
- assertThat(res, containsString("Logged in as " + org2.getName() + " (on behalf of " + u2.getPreferredName()));
+ assertThat(res, containsString("Logged in as " + u2.getPreferredName() + ", acting as " + org2.getName()));
}
assertNull(executeBasicWebInteraction(cookie, SwitchOrganisation.PATH, "org:" + org1.getId() + "=y", 0));
String res = IOUtils.readURL(get(SwitchOrganisation.PATH));
- assertThat(res, containsString("Logged in as " + org1.getName() + " (on behalf of " + u2.getPreferredName()));
+ assertThat(res, containsString("Logged in as " + u2.getPreferredName() + ", acting as " + org1.getName()));
}