Skip to content

Commit 6387702

Browse files
committed
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.
1 parent 112b952 commit 6387702

1 file changed

Lines changed: 3 additions & 12 deletions

File tree

client-lib-tests/src/fat/java/com/ibm/ws/repository/test/ResourceTest.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
import com.ibm.ws.lars.testutils.fixtures.RepositoryFixture;
6363
import com.ibm.ws.repository.common.enums.AttachmentLinkType;
6464
import com.ibm.ws.repository.common.enums.AttachmentType;
65-
import com.ibm.ws.repository.common.enums.State;
6665
import com.ibm.ws.repository.common.enums.ResourceType;
66+
import com.ibm.ws.repository.common.enums.State;
6767
import com.ibm.ws.repository.common.utils.internal.HashUtils;
6868
import com.ibm.ws.repository.connections.RepositoryConnection;
6969
import com.ibm.ws.repository.connections.RepositoryConnectionList;
@@ -79,8 +79,8 @@
7979
import com.ibm.ws.repository.resources.internal.IfixResourceImpl;
8080
import com.ibm.ws.repository.resources.internal.ProductResourceImpl;
8181
import com.ibm.ws.repository.resources.internal.RepositoryResourceImpl;
82-
import com.ibm.ws.repository.resources.internal.ResourceFactory;
8382
import com.ibm.ws.repository.resources.internal.RepositoryResourceImpl.AttachmentResourceImpl;
83+
import com.ibm.ws.repository.resources.internal.ResourceFactory;
8484
import com.ibm.ws.repository.resources.internal.SampleResourceImpl;
8585
import com.ibm.ws.repository.resources.internal.UpdateType;
8686
import com.ibm.ws.repository.resources.writeable.RepositoryResourceWritable;
@@ -568,7 +568,7 @@ public void testUpdateURLInAttachment() throws RepositoryException, IOException,
568568
// No url specified yet
569569
sampleRes.addAttachment(attachment, AttachmentType.DOCUMENTATION, "useDefaultURL");
570570
List<RepositoryResourceImpl> matching = sampleRes.findMatchingResource();
571-
assertEquals("Asset had been uploaded, isUpdateRequired should have returned ADD",
571+
assertEquals("Asset has not been uploaded, isUpdateRequired should have returned ADD",
572572
UpdateType.ADD, sampleRes.updateRequired(getFirst(matching)));
573573
sampleAtt = (AttachmentResourceImpl) sampleRes.getAttachment("useDefaultURL");
574574
assertEquals("Attachment was added, isUpdateRequired should have returned type ADD",
@@ -585,15 +585,6 @@ public void testUpdateURLInAttachment() throws RepositoryException, IOException,
585585
UpdateType.NOTHING, sampleAtt.updateRequired(getFirst(matching)));
586586
uploadResource(sampleRes);
587587

588-
// Now go back to using the massive provided URLs - we can't do this....yet....
589-
// sampleRes.addAttachment(attachment, AttachmentType.DOCUMENTATION, "useDefaultURL");
590-
// matching = sampleRes.findMatchingResource();
591-
// assertEquals ("Attachment had been uploaded, isUpdateRequired should have returned NOTHING",
592-
// UpdateType.NOTHING, sampleRes.updateRequired(matching));
593-
// assertEquals ("Attachment was added, isUpdateRequired should have returned type UPDATE",
594-
// UpdateType.UPDATE, sampleRes.getAttachment("useDefaultURL").updateRequired(matching));
595-
// uploadResource(sampleRes);
596-
597588
// Now create a new attachment and use the internal URL, should add a new attachment
598589
sampleRes.addAttachment(attachment, AttachmentType.DOCUMENTATION, "specifyURL");
599590
matching = sampleRes.findMatchingResource();

0 commit comments

Comments
 (0)