From ca8ae6d497252273eba938b0faa31297b4955564 Mon Sep 17 00:00:00 2001 From: Jay Hodgson Date: Thu, 7 Nov 2024 10:11:20 -0600 Subject: [PATCH] update test --- .../widget/entity/EntityMetadataTest.java | 40 +++++-------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityMetadataTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityMetadataTest.java index ea75e3dca5..5169537ce0 100644 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityMetadataTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityMetadataTest.java @@ -1,5 +1,8 @@ package org.sagebionetworks.web.unitclient.widget.entity; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -44,6 +47,7 @@ import org.sagebionetworks.web.client.widget.entity.*; import org.sagebionetworks.web.client.widget.entity.menu.v3.EntityActionMenu; import org.sagebionetworks.web.client.widget.entity.restriction.v2.RestrictionWidget; +import org.sagebionetworks.web.client.widget.projectdataavailability.ProjectDataAvaiilability; import org.sagebionetworks.web.test.helper.AsyncMockStubber; @RunWith(MockitoJUnitRunner.Silent.class) @@ -55,9 +59,6 @@ public class EntityMetadataTest { @Mock DoiWidgetV2 mockDoiWidgetV2; - @Mock - RestrictionWidget mockRestrictionWidgetV2; - @Mock VersionHistoryWidget mockFileHistoryWidget; @@ -76,15 +77,15 @@ public class EntityMetadataTest { @Mock CookieProvider mockCookies; - @Mock - ContainerItemCountWidget mockItemCountWidget; - @Mock PortalGinInjector mockGinInjector; @Mock EntityModalWidget mockEntityModalWidget; + @Mock + ProjectDataAvaiilability mockProjectDataAvaiilability; + String entityId = "syn123"; String entityName = "testEntity"; EntityMetadata widget; @@ -102,10 +103,9 @@ public void before() { mockDoiWidgetV2, mockJsClient, mockJSNI, - mockRestrictionWidgetV2, - mockItemCountWidget, mockGinInjector, - mockEntityModalWidget + mockEntityModalWidget, + mockProjectDataAvaiilability ); } @@ -113,9 +113,6 @@ public void before() { public void testConstruction() { verify(mockView).setDoiWidget(any(IsWidget.class)); verify(mockView, never()).setVersionHistoryWidget(any(IsWidget.class)); // lazily created - verify(mockView).setRestrictionWidgetV2(any(IsWidget.class)); - verify(mockRestrictionWidgetV2).setShowChangeLink(true); - verify(mockView).setRestrictionWidgetV2Visible(true); } @Test @@ -127,7 +124,6 @@ public void testSetEntityBundleProject() { UserEntityPermissions permissions = mock(UserEntityPermissions.class); boolean canChangePermissions = false; boolean canCertifiedUserEdit = true; - boolean isCurrentVersion = true; when(permissions.getCanChangePermissions()) .thenReturn(canChangePermissions); when(permissions.getCanCertifiedUserEdit()) @@ -141,11 +137,8 @@ public void testSetEntityBundleProject() { bundle.setDoiAssociation(mockDoiAssociation); widget.configure(bundle, null, mockActionMenuWidget); verify(mockView).setDetailedMetadataVisible(true); - verify(mockView).setRestrictionPanelVisible(false); verify(mockDoiWidgetV2).configure(mockDoiAssociation); - verify(mockRestrictionWidgetV2).configure(project, canChangePermissions); - verify(mockView, never()).setRestrictionWidgetV2Visible(false); - verify(mockItemCountWidget, never()).configure(anyString()); + verify(mockProjectDataAvaiilability).setProjectId(entityId); } @Test @@ -158,7 +151,6 @@ public void testSetEntityBundleProjectInAlphaMode() { UserEntityPermissions permissions = mock(UserEntityPermissions.class); boolean canChangePermissions = false; boolean canCertifiedUserEdit = true; - boolean isCurrentVersion = true; when(permissions.getCanChangePermissions()) .thenReturn(canChangePermissions); when(permissions.getCanCertifiedUserEdit()) @@ -172,11 +164,8 @@ public void testSetEntityBundleProjectInAlphaMode() { bundle.setDoiAssociation(mockDoiAssociation); widget.configure(bundle, null, mockActionMenuWidget); verify(mockView).setDetailedMetadataVisible(true); - verify(mockView).setRestrictionPanelVisible(false); verify(mockDoiWidgetV2).configure(mockDoiAssociation); - verify(mockRestrictionWidgetV2).configure(project, canChangePermissions); - verify(mockView, never()).setRestrictionWidgetV2Visible(false); - verify(mockItemCountWidget, never()).configure(anyString()); + verify(mockProjectDataAvaiilability).setProjectId(entityId); } @Test @@ -184,7 +173,6 @@ public void testSetEntityBundleDockerRepo() { UserEntityPermissions permissions = mock(UserEntityPermissions.class); boolean canChangePermissions = true; boolean canCertifiedUserEdit = false; - boolean isCurrentVersion = true; when(permissions.getCanChangePermissions()) .thenReturn(canChangePermissions); when(permissions.getCanCertifiedUserEdit()) @@ -202,7 +190,6 @@ public void testSetEntityBundleDockerRepo() { verify(mockFileHistoryWidget, never()) .setEntityBundle(bundle, versionNumber); verify(mockDoiWidgetV2).configure(mockDoiAssociation); - verify(mockItemCountWidget, never()).configure(anyString()); } @Test @@ -502,7 +489,6 @@ public void testSetEntityBundleFolder() { UserEntityPermissions permissions = mock(UserEntityPermissions.class); boolean canChangePermissions = false; boolean canCertifiedUserEdit = true; - boolean isCurrentVersion = true; when(permissions.getCanChangePermissions()) .thenReturn(canChangePermissions); when(permissions.getCanCertifiedUserEdit()) @@ -515,10 +501,6 @@ public void testSetEntityBundleFolder() { widget.configure(bundle, null, mockActionMenuWidget); verify(mockView).setDetailedMetadataVisible(false); verify(mockDoiWidgetV2).configure(mockDoiAssociation); - verify(mockRestrictionWidgetV2) - .configure(folderEntity, canChangePermissions); - verify(mockView, never()).setRestrictionWidgetV2Visible(false); - verify(mockItemCountWidget).configure(entityId); } @Test