From 638770215837a274d869c379511ef91824b2995b Mon Sep 17 00:00:00 2001 From: Dave Barfield Date: Wed, 27 Jan 2016 15:10:58 +0000 Subject: [PATCH] Change to test assert message plus remove unused code in ResourceTest One assert message was theopposite of what it should have said and a commented out section of code has been implemented already. --- .../com/ibm/ws/repository/test/ResourceTest.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/client-lib-tests/src/fat/java/com/ibm/ws/repository/test/ResourceTest.java b/client-lib-tests/src/fat/java/com/ibm/ws/repository/test/ResourceTest.java index 5818479..a0d18bf 100644 --- a/client-lib-tests/src/fat/java/com/ibm/ws/repository/test/ResourceTest.java +++ b/client-lib-tests/src/fat/java/com/ibm/ws/repository/test/ResourceTest.java @@ -62,8 +62,8 @@ import com.ibm.ws.lars.testutils.fixtures.RepositoryFixture; import com.ibm.ws.repository.common.enums.AttachmentLinkType; import com.ibm.ws.repository.common.enums.AttachmentType; -import com.ibm.ws.repository.common.enums.State; import com.ibm.ws.repository.common.enums.ResourceType; +import com.ibm.ws.repository.common.enums.State; import com.ibm.ws.repository.common.utils.internal.HashUtils; import com.ibm.ws.repository.connections.RepositoryConnection; import com.ibm.ws.repository.connections.RepositoryConnectionList; @@ -79,8 +79,8 @@ import com.ibm.ws.repository.resources.internal.IfixResourceImpl; import com.ibm.ws.repository.resources.internal.ProductResourceImpl; import com.ibm.ws.repository.resources.internal.RepositoryResourceImpl; -import com.ibm.ws.repository.resources.internal.ResourceFactory; import com.ibm.ws.repository.resources.internal.RepositoryResourceImpl.AttachmentResourceImpl; +import com.ibm.ws.repository.resources.internal.ResourceFactory; import com.ibm.ws.repository.resources.internal.SampleResourceImpl; import com.ibm.ws.repository.resources.internal.UpdateType; import com.ibm.ws.repository.resources.writeable.RepositoryResourceWritable; @@ -568,7 +568,7 @@ public void testUpdateURLInAttachment() throws RepositoryException, IOException, // No url specified yet sampleRes.addAttachment(attachment, AttachmentType.DOCUMENTATION, "useDefaultURL"); List matching = sampleRes.findMatchingResource(); - assertEquals("Asset had been uploaded, isUpdateRequired should have returned ADD", + assertEquals("Asset has not been uploaded, isUpdateRequired should have returned ADD", UpdateType.ADD, sampleRes.updateRequired(getFirst(matching))); sampleAtt = (AttachmentResourceImpl) sampleRes.getAttachment("useDefaultURL"); assertEquals("Attachment was added, isUpdateRequired should have returned type ADD", @@ -585,15 +585,6 @@ public void testUpdateURLInAttachment() throws RepositoryException, IOException, UpdateType.NOTHING, sampleAtt.updateRequired(getFirst(matching))); uploadResource(sampleRes); - // Now go back to using the massive provided URLs - we can't do this....yet.... -// sampleRes.addAttachment(attachment, AttachmentType.DOCUMENTATION, "useDefaultURL"); -// matching = sampleRes.findMatchingResource(); -// assertEquals ("Attachment had been uploaded, isUpdateRequired should have returned NOTHING", -// UpdateType.NOTHING, sampleRes.updateRequired(matching)); -// assertEquals ("Attachment was added, isUpdateRequired should have returned type UPDATE", -// UpdateType.UPDATE, sampleRes.getAttachment("useDefaultURL").updateRequired(matching)); -// uploadResource(sampleRes); - // Now create a new attachment and use the internal URL, should add a new attachment sampleRes.addAttachment(attachment, AttachmentType.DOCUMENTATION, "specifyURL"); matching = sampleRes.findMatchingResource();