Use timeout, actual ICAT ids and Long.equals in UserResourceTest #35

[patrick-austin]

No functional changes, just changes to the test so they pass for me locally and on CI:

• Updated icat-ansible branch from payara6->master
• Add a utility method for getting any single Entity of a given type, for use in tests
• Used above method in places where we were hardcoding entity ids to 1
• Use Long.equals instead of == in findDownload
• Set a timeout in the test run.properties

Closes #35

[kevinphippsstfc]

Looks good.
Just a comment I think needs adding for clarity.

[kevinphippsstfc]

I feel that as this code is in IcatClient which is not solely used by test classes that there ought to be a clarification/warning that this method is currently just to support the tests (hence the slightly weird behaviour of just getting a somewhat random entity) and only works for entities such as Investigation, Dataset and Datafile, and not any that would require double or treble capitalisation such as InvestigationUser, DataCollectionInvestigation etc.

[patrick-austin]

Good idea, since there were instances elsewhere of code being made public for testing e.g.

datagateway-download-api/src/main/java/org/icatproject/topcat/StatusCheck.java

Lines 88 to 98 in ada0dff

	/**
	* Update the status of each relevant download.
	*
	* @param pollDelay minimum time to wait before initial preparation/check
	* @param pollIntervalWait minimum time between checks
	* @param injectedIdsClient optional (possibly mock) IdsClient
	* @throws Exception
	*/
	public void updateStatuses(int pollDelay, int pollIntervalWait, IdsClient injectedIdsClient) throws Exception {
	// This method is intended for testing, but we are forced to make it public rather than protected.

I also did that here, but it should include a warning/justification like those do.