Remove EntityManager from StatusCheckTest and re-enable #38

ral-facilities · Nov 27, 2024 · 0c3ad3e · 0c3ad3e
1 parent 25b68c7
commit 0c3ad3e
Show file tree

Hide file tree

Showing 3 changed files with 726 additions and 707 deletions.
diff --git a/pom.xml b/pom.xml
@@ -244,12 +244,6 @@
 						<artifactId>maven-surefire-plugin</artifactId>
 						<version>2.19.1</version>
 						<configuration>
-							<excludes>
-								<!-- Requires an arquillian-persistence implementation compatible with the jakarta namespace. -->
-								<exclude>**/StatusCheckTest.java</exclude>
-							</excludes>
-							<!-- TODO remove next line -->
-							<!-- <skipTests>true</skipTests> -->
 							<argLine>-Xmx768m -XX:MaxMetaspaceSize=256m</argLine>
 							<systemPropertyVariables>
 								<java.util.logging.config.file>

diff --git a/src/main/java/org/icatproject/topcat/StatusCheck.java b/src/main/java/org/icatproject/topcat/StatusCheck.java
@@ -278,8 +278,11 @@ private void prepareDownload(Download download, IdsClient injectedIdsClient) thr
    * @param maxActiveDownloads Limit on the number of concurrent jobs with RESTORING status
    * @throws Exception
    */
-  private void startQueuedDownloads(int maxActiveDownloads) throws Exception {
-    if (maxActiveDownloads == 0) { return; }
+  public void startQueuedDownloads(int maxActiveDownloads) throws Exception {
+    if (maxActiveDownloads == 0) {
+      return;
+    }
+
     String selectString = "select download from Download download where download.isDeleted != true";
     String restoringCondition = "download.status = org.icatproject.topcat.domain.DownloadStatus.RESTORING";
     String pausedCondition = "download.status = org.icatproject.topcat.domain.DownloadStatus.PAUSED";
@@ -288,7 +291,7 @@ private void startQueuedDownloads(int maxActiveDownloads) throws Exception {
     TypedQuery<Download> activeDownloadsQuery = em.createQuery(activeQueryString, Download.class);
     List<Download> activeDownloads = activeDownloadsQuery.getResultList();
 
-    String queuedQueryString = selectString + " and " + pausedCondition + " and download.preparedId == null";
+    String queuedQueryString = selectString + " and " + pausedCondition + " and download.preparedId = null";
     if (maxActiveDownloads > 0) {
       int freeActiveDownloads = maxActiveDownloads - activeDownloads.size();
       if (freeActiveDownloads <= 0) {