SWC-6776, SWC-7096 - Fix tests, use AsyncCallback for easier mocking

Sage-Bionetworks · Oct 3, 2024 · 87a4fd0 · 87a4fd0
1 parent 33011e3
commit 87a4fd0
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 56 deletions.
diff --git a/src/main/java/org/sagebionetworks/web/client/SynapseJavascriptClient.java b/src/main/java/org/sagebionetworks/web/client/SynapseJavascriptClient.java
@@ -3296,32 +3296,31 @@ public FluentFuture<Void> deleteSessionAccessToken() {
     return getFuture(cb -> doDelete(url, cb));
   }
 
-  public FluentFuture<AccessControlList> getEntityBenefactorAcl(
-    String entityId
+  public void getEntityBenefactorAcl(
+    String entityId,
+    AsyncCallback<AccessControlList> cb
   ) {
     // Retrieving the benefactor ACL is always permitted regardless of permissions, so only retrieve that part of the bundle.
     EntityBundleRequest request = new EntityBundleRequest();
     request.setIncludeBenefactorACL(true);
     String url = getRepoServiceUrl() + ENTITY + "/" + entityId + BUNDLE2;
 
-    return getFuture(cb ->
-      doPost(
-        url,
-        request,
-        OBJECT_TYPE.EntityBundle,
-        true,
-        new AsyncCallback<EntityBundle>() {
-          @Override
-          public void onFailure(Throwable caught) {
-            cb.onFailure(caught);
-          }
+    doPost(
+      url,
+      request,
+      OBJECT_TYPE.EntityBundle,
+      true,
+      new AsyncCallback<EntityBundle>() {
+        @Override
+        public void onSuccess(EntityBundle result) {
+          cb.onSuccess(result.getBenefactorAcl());
+        }
 
-          @Override
-          public void onSuccess(EntityBundle result) {
-            cb.onSuccess(result.getBenefactorAcl());
-          }
+        @Override
+        public void onFailure(Throwable caught) {
+          cb.onFailure(caught);
         }
-      )
+      }
     );
   }
 }
diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/download/Uploader.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/download/Uploader.java
@@ -791,26 +791,29 @@ public void onSuccess(Entity result) {
         entity = result;
         view.showInfo(DisplayConstants.TEXT_LINK_SUCCESS);
         if (successHandler != null) {
-          jsClient
-            .getEntityBenefactorAcl(result.getId())
-            .addCallback(
-              new FutureCallback<AccessControlList>() {
-                @Override
-                public void onSuccess(AccessControlList benefactorAcl) {
+          jsClient.getEntityBenefactorAcl(
+            result.getId(),
+            new AsyncCallback<AccessControlList>() {
+              @Override
+              public void onSuccess(AccessControlList benefactorAcl) {
+                if (benefactorAcl.getId().equals(entity.getId())) {
+                  // Don't show the ACL modal if the entity is its own benefactor
+                  successHandler.onSuccessfulUpload(null);
+                } else {
                   successHandler.onSuccessfulUpload(benefactorAcl.getId());
-                  entityUpdated();
                 }
+                entityUpdated();
+              }
 
-                @Override
-                public void onFailure(Throwable caught) {
-                  view.showErrorMessage(caught.getMessage());
-                  // Upload was still a success, benefactor ID is not required to continue
-                  successHandler.onSuccessfulUpload(null);
-                  entityUpdated();
-                }
-              },
-              directExecutor()
-            );
+              @Override
+              public void onFailure(Throwable caught) {
+                view.showErrorMessage(caught.getMessage());
+                // Upload was still a success, benefactor ID is not required to continue
+                successHandler.onSuccessfulUpload(null);
+                entityUpdated();
+              }
+            }
+          );
         }
       }
 
@@ -1027,26 +1030,29 @@ private void uploadSuccess() {
     view.resetToInitialState();
     resetUploadProgress();
     if (successHandler != null) {
-      jsClient
-        .getEntityBenefactorAcl(entityId)
-        .addCallback(
-          new FutureCallback<AccessControlList>() {
-            @Override
-            public void onSuccess(AccessControlList benefactorAcl) {
+      jsClient.getEntityBenefactorAcl(
+        entityId,
+        new AsyncCallback<AccessControlList>() {
+          @Override
+          public void onSuccess(AccessControlList benefactorAcl) {
+            if (benefactorAcl.getId().equals(entityId)) {
+              // Don't show the ACL modal if the entity is its own benefactor
+              successHandler.onSuccessfulUpload(null);
+            } else {
               successHandler.onSuccessfulUpload(benefactorAcl.getId());
-              entityUpdated();
             }
+            entityUpdated();
+          }
 
-            @Override
-            public void onFailure(Throwable caught) {
-              view.showErrorMessage(caught.getMessage());
-              // Upload was still a success, benefactor ID is not required to continue.
-              successHandler.onSuccessfulUpload(null);
-              entityUpdated();
-            }
-          },
-          directExecutor()
-        );
+          @Override
+          public void onFailure(Throwable caught) {
+            view.showErrorMessage(caught.getMessage());
+            // Upload was still a success, benefactor ID is not required to continue.
+            successHandler.onSuccessfulUpload(null);
+            entityUpdated();
+          }
+        }
+      );
     }
   }
 

diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/download/UploaderTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/download/UploaderTest.java
@@ -293,7 +293,7 @@ public void testSetNewExternalPath() throws Exception {
     // associate the path.
     AsyncMockStubber
       .callSuccessWith(new AccessControlList().setId(UPLOAD_BENEFACTOR_ID))
-      .when(mockSynapseClient)
+      .when(mockSynapseJavascriptClient)
       .getEntityBenefactorAcl(anyString(), any(AsyncCallback.class));
 
     uploader.setExternalFilePath(
@@ -312,7 +312,7 @@ public void testSetNewExternalPath() throws Exception {
         eq(storageLocationId),
         any()
       );
-    verify(mockSynapseClient)
+    verify(mockSynapseJavascriptClient)
       .getEntityBenefactorAcl(anyString(), any(AsyncCallback.class));
     verify(mockView).showInfo(anyString());
     verify(mockUploadSuccessHandler).onSuccessfulUpload(UPLOAD_BENEFACTOR_ID);
@@ -420,14 +420,14 @@ public void testDirectUploadHappyCase() throws Exception {
       .getEntity(anyString(), any(OBJECT_TYPE.class), any(AsyncCallback.class));
     AsyncMockStubber
       .callSuccessWith(new AccessControlList().setId(UPLOAD_BENEFACTOR_ID))
-      .when(mockSynapseClient)
+      .when(mockSynapseJavascriptClient)
       .getEntityBenefactorAcl(anyString(), any(AsyncCallback.class));
     uploader.handleUploads();
     verify(mockGlobalApplicationState).clearDropZoneHandler(); // SWC-5161 (cleared on handleUploads)
     verify(mockView).disableSelectionDuringUpload();
     verify(mockSynapseClient)
       .setFileEntityFileHandle(any(), any(), any(), any());
-    verify(mockSynapseClient)
+    verify(mockSynapseJavascriptClient)
       .getEntityBenefactorAcl(anyString(), any(AsyncCallback.class));
     verify(mockView).hideLoading();
     assertEquals(UploadType.S3, uploader.getCurrentUploadType());