Skip to content

Change to test assert message plus remove unused code in ResourceTest #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
idlewis merged 1 commit into from
Jan 28, 2016
Merged

Change to test assert message plus remove unused code in ResourceTest #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions client-lib-tests/src/fat/java/com/ibm/ws/repository/test/ResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -568,7 +568,7 @@ public void testUpdateURLInAttachment() throws RepositoryException, IOException,
// No url specified yet
sampleRes.addAttachment(attachment, AttachmentType.DOCUMENTATION, "useDefaultURL");
List<RepositoryResourceImpl> 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",
Expand All @@ -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();
Expand Down