diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java index 28b240fdd..7ce14b845 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java @@ -36,8 +36,6 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectP import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditDataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; @@ -212,31 +210,16 @@ public class SelfEditingPolicyTest extends AbstractTestClass { // @Test public void testVisitIdentifierBundleEditDataPropStmt() { - - DataPropertyStatement dps = new DataPropertyStatementImpl(); - dps.setIndividualURI(SELFEDITOR_URI); - dps.setDatapropURI(SAFE_PREDICATE); - dps.setData("junk"); - whatToAuth = new EditDataPropertyStatement(dps); + whatToAuth = new EditDataPropertyStatement(SELFEDITOR_URI,SAFE_PREDICATE); assertDecision(AUTHORIZED, policy.isAuthorized(ids, whatToAuth)); - dps = new DataPropertyStatementImpl(); - dps.setIndividualURI(SELFEDITOR_URI); - dps.setDatapropURI(UNSAFE_PREDICATE); - dps.setData("junk"); - whatToAuth = new EditDataPropertyStatement(dps); + whatToAuth = new EditDataPropertyStatement(SELFEDITOR_URI, UNSAFE_PREDICATE); assertDecision(INCONCLUSIVE, policy.isAuthorized(ids, whatToAuth)); - dps = new DataPropertyStatementImpl(); - dps.setIndividualURI(UNSAFE_RESOURCE); - dps.setDatapropURI(SAFE_PREDICATE); - whatToAuth = new EditDataPropertyStatement(dps); + whatToAuth = new EditDataPropertyStatement(UNSAFE_RESOURCE, SAFE_PREDICATE); assertDecision(INCONCLUSIVE, policy.isAuthorized(ids, whatToAuth)); - dps = new DataPropertyStatementImpl(); - dps.setIndividualURI(SAFE_RESOURCE); - dps.setDatapropURI(SAFE_PREDICATE); - whatToAuth = new EditDataPropertyStatement(dps); + whatToAuth = new EditDataPropertyStatement(SAFE_RESOURCE, SAFE_PREDICATE); assertDecision(INCONCLUSIVE, policy.isAuthorized(ids, whatToAuth)); } @@ -296,11 +279,7 @@ public class SelfEditingPolicyTest extends AbstractTestClass { public void twoSEIsFindDataPropertySubject() { setUpTwoSEIs(); - DataPropertyStatement dps = new DataPropertyStatementImpl(); - dps.setIndividualURI(SELFEDITOR_URI); - dps.setDatapropURI(SAFE_PREDICATE); - dps.setData("junk"); - whatToAuth = new EditDataPropertyStatement(dps); + whatToAuth = new EditDataPropertyStatement(SELFEDITOR_URI, SAFE_PREDICATE); assertDecision(AUTHORIZED, policy.isAuthorized(ids, whatToAuth)); } @@ -308,11 +287,7 @@ public class SelfEditingPolicyTest extends AbstractTestClass { public void twoSEIsDontFindInDataProperty() { setUpTwoSEIs(); - DataPropertyStatement dps = new DataPropertyStatementImpl(); - dps.setIndividualURI(SAFE_RESOURCE); - dps.setDatapropURI(SAFE_PREDICATE); - dps.setData("junk"); - whatToAuth = new EditDataPropertyStatement(dps); + whatToAuth = new EditDataPropertyStatement(SAFE_RESOURCE, SAFE_PREDICATE); assertDecision(INCONCLUSIVE, policy.isAuthorized(ids, whatToAuth)); } diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java index dc0d4fc5e..1d4b61f1c 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java @@ -294,13 +294,8 @@ public class SelfEditingPolicy_2_Test extends AbstractTestClass { */ private void assertEditDataPropStmt(String individualURI, String datapropURI, String data, Authorization expectedAuthorization) { - DataPropertyStatement dps = new DataPropertyStatementImpl(); - dps.setIndividualURI(individualURI); - dps.setDatapropURI(datapropURI); - dps.setData(data); - EditDataPropertyStatement whatToAuth = new EditDataPropertyStatement( - dps); + individualURI, datapropURI); PolicyDecision dec = policy.isAuthorized(ids, whatToAuth); log.debug(dec); Assert.assertNotNull(dec);