From 6d98124340e00b827f2008a230a05682b492c99c Mon Sep 17 00:00:00 2001 From: j2blake Date: Sat, 26 Oct 2013 17:04:18 -0400 Subject: [PATCH 1/2] Fix the scan to reduce false positives. Also, truncate the lines on output if over 100 characters. --- utilities/ISF-transition/obsoleteUris/directory_walker.rb | 4 ++-- utilities/ISF-transition/obsoleteUris/report.rb | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/utilities/ISF-transition/obsoleteUris/directory_walker.rb b/utilities/ISF-transition/obsoleteUris/directory_walker.rb index c7c87ea8..5ccaa89c 100644 --- a/utilities/ISF-transition/obsoleteUris/directory_walker.rb +++ b/utilities/ISF-transition/obsoleteUris/directory_walker.rb @@ -34,13 +34,13 @@ class DirectoryWalker def scan_line(path, line_number, line) @obsolete_uris.uris.each do |uri| next if @known_exceptions.skip?(path, line_number, uri) - @report.add_event(Event.new(path, line_number, line, uri)) if line =~ Regexp.new(Regexp.quote(uri)) + @report.add_event(Event.new(path, line_number, line, uri)) if line =~ Regexp.new("\\b#{Regexp.quote(uri)}\\b") end if @complete @obsolete_uris.localnames.each do |localname| term = ":#{localname}" next if @known_exceptions.skip?(path, line_number, term) - @report.add_event(Event.new(path, line_number, line, term)) if line =~ Regexp.new(Regexp.quote(term)) + @report.add_event(Event.new(path, line_number, line, term)) if line =~ Regexp.new("#{Regexp.quote(term)}\\b") end end end diff --git a/utilities/ISF-transition/obsoleteUris/report.rb b/utilities/ISF-transition/obsoleteUris/report.rb index aa9dce78..0bdef5eb 100644 --- a/utilities/ISF-transition/obsoleteUris/report.rb +++ b/utilities/ISF-transition/obsoleteUris/report.rb @@ -33,7 +33,13 @@ class Report hash.sort.each do |path, events| puts "#{path}" events.sort{|a, b| a.line_number <=> b.line_number }.each do |e| - puts " #{e.line_number} #{e.line}" + trimmed = + if e.line.size <= 100 + e.line + else + e.line[0..97] << "..." + end + puts " #{e.line_number} #{trimmed}" puts " #{e.is_localname ? "Localname" : "URI"} #{e.string}" end puts "--------------------" From 042a48ea1f7b6549a9289a8428327dcc51455257 Mon Sep 17 00:00:00 2001 From: j2blake Date: Sat, 26 Oct 2013 18:02:17 -0400 Subject: [PATCH 2/2] VIVO-268 Restore data values to DataProperty RequestedAction classes. --- .../ManageLabelsForPersonGenerator.java | 4 +- .../SelfEditorRelationshipPolicyTest.java | 59 ++++++++----------- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java index 001a426b..bb8a72d4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java @@ -1,6 +1,8 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; +import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants.SOME_LITERAL; + import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Arrays; @@ -335,7 +337,7 @@ public class ManageLabelsForPersonGenerator extends BaseEditConfigurationGenerat Individual individual = EditConfigurationUtils.getIndividual(vreq, config.getSubjectUri()); AddDataPropertyStatement adps = new AddDataPropertyStatement( vreq.getJenaOntModel(), individual.getURI(), - RequestActionConstants.SOME_URI); + RequestActionConstants.SOME_URI, SOME_LITERAL); AddObjectPropertyStatement aops = new AddObjectPropertyStatement( vreq.getJenaOntModel(), individual.getURI(), diff --git a/test/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java b/test/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java index d3f9863d..50219042 100644 --- a/test/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java +++ b/test/edu/cornell/mannlib/vivo/auth/policy/SelfEditorRelationshipPolicyTest.java @@ -4,6 +4,7 @@ package edu.cornell.mannlib.vivo.auth.policy; import static edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization.AUTHORIZED; import static edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization.INCONCLUSIVE; +import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants.SOME_LITERAL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -44,10 +45,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; /** * Check the relationships in the SelfEditorRelationshipPolicy. * - * This only checks the relationships that deal with InfoContentEntitys. - * Testing the others seems too redundant. If we generalize this to use - * configurable relationships, then we'll be able to make more general tests as - * well. + * This only checks the relationships that deal with InfoContentEntitys. Testing + * the others seems too redundant. If we generalize this to use configurable + * relationships, then we'll be able to make more general tests as well. */ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { private static final Log log = LogFactory @@ -69,12 +69,12 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { private static final String URI_PERMITTED_PREDICATE = NS_PERMITTED + "permittedPredicate"; - private static final Property PERMITTED_PREDICATE = new Property( - URI_PERMITTED_PREDICATE); + private static final Property PERMITTED_PREDICATE = new Property( + URI_PERMITTED_PREDICATE); private static final String URI_RESTRICTED_PREDICATE = NS_RESTRICTED + "restrictedPredicate"; - private static final Property RESTRICTED_PREDICATE = new Property( - URI_RESTRICTED_PREDICATE); + private static final Property RESTRICTED_PREDICATE = new Property( + URI_RESTRICTED_PREDICATE); /** * Where the model statements are stored for this test. @@ -185,30 +185,28 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void dataPropSubjectIsRestricted() { action = new AddDataPropertyStatement(ontModel, - URI_RESTRICTED_RESOURCE, URI_PERMITTED_PREDICATE); + URI_RESTRICTED_RESOURCE, URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); } @Test public void dataPropPredicateIsRestricted() { action = new AddDataPropertyStatement(ontModel, URI_JOE_EDITED_IT, - URI_RESTRICTED_PREDICATE); + URI_RESTRICTED_PREDICATE, SOME_LITERAL); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); } @Test public void objectPropSubjectIsRestricted() { action = new AddObjectPropertyStatement(ontModel, - URI_RESTRICTED_RESOURCE, PERMITTED_PREDICATE, - URI_JOE_EDITED_IT); + URI_RESTRICTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_EDITED_IT); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); } @Test public void objectPropPredicateIsRestricted() { action = new AddObjectPropertyStatement(ontModel, - URI_PERMITTED_RESOURCE, RESTRICTED_PREDICATE, - URI_JOE_EDITED_IT); + URI_PERMITTED_RESOURCE, RESTRICTED_PREDICATE, URI_JOE_EDITED_IT); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); } @@ -226,14 +224,14 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void dataPropSubjectIsIceButNobodyIsSelfEditing() { action = new AddDataPropertyStatement(ontModel, URI_JOE_WROTE_IT, - URI_PERMITTED_PREDICATE); + URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action)); } @Test public void dataPropSubjectIsIceButNoAuthorsOrEditorsOrFeatured() { action = new AddDataPropertyStatement(ontModel, URI_NOBODY_WROTE_IT, - URI_PERMITTED_PREDICATE); + URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); assertDecision(INCONCLUSIVE, policy.isAuthorized(idBozoAndJoe, action)); } @@ -241,28 +239,28 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void dataPropSubjectIsIceButWrongAuthor() { action = new AddDataPropertyStatement(ontModel, URI_BOZO_WROTE_IT, - URI_PERMITTED_PREDICATE); + URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); } @Test public void dataPropSubjectIsIceButWrongEditor() { action = new AddDataPropertyStatement(ontModel, URI_BOZO_EDITED_IT, - URI_PERMITTED_PREDICATE); + URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); } @Test public void dataPropSubjectIsIceButWrongFeatured() { action = new AddDataPropertyStatement(ontModel, - URI_BOZO_FEATURED_IN_IT, URI_PERMITTED_PREDICATE); + URI_BOZO_FEATURED_IN_IT, URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); } @Test public void dataPropSubjectIsIceWithSelfEditingAuthor() { action = new AddDataPropertyStatement(ontModel, URI_JOE_WROTE_IT, - URI_PERMITTED_PREDICATE); + URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action)); assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action)); } @@ -270,7 +268,7 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void dataPropSubjectIsIceWithSelfEditingEditor() { action = new AddDataPropertyStatement(ontModel, URI_JOE_EDITED_IT, - URI_PERMITTED_PREDICATE); + URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action)); assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action)); } @@ -278,7 +276,7 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void dataPropSubjectIsIceWithSelfEditingFeatured() { action = new AddDataPropertyStatement(ontModel, URI_JOE_FEATURED_IN_IT, - URI_PERMITTED_PREDICATE); + URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action)); assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action)); } @@ -348,8 +346,7 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void objectPropObjectIsIcebutNobodyIsSelfEditing() { action = new AddObjectPropertyStatement(ontModel, - URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, - URI_JOE_EDITED_IT); + URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_EDITED_IT); assertDecision(INCONCLUSIVE, policy.isAuthorized(idNobody, action)); } @@ -365,16 +362,14 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void objectPropObjectIsIceButWrongAuthor() { action = new AddObjectPropertyStatement(ontModel, - URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, - URI_BOZO_WROTE_IT); + URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_BOZO_WROTE_IT); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); } @Test public void objectPropObjectIsIceButWrongEditor() { action = new AddObjectPropertyStatement(ontModel, - URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, - URI_BOZO_EDITED_IT); + URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_BOZO_EDITED_IT); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); } @@ -389,8 +384,7 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void objectPropObjectIsIceWithSelfEditingAuthor() { action = new AddObjectPropertyStatement(ontModel, - URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, - URI_JOE_WROTE_IT); + URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_WROTE_IT); assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action)); assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action)); } @@ -398,8 +392,7 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void objectPropObjectIsIceWithSelfEditingEditor() { action = new AddObjectPropertyStatement(ontModel, - URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, - URI_JOE_EDITED_IT); + URI_PERMITTED_RESOURCE, PERMITTED_PREDICATE, URI_JOE_EDITED_IT); assertDecision(AUTHORIZED, policy.isAuthorized(idJoe, action)); assertDecision(AUTHORIZED, policy.isAuthorized(idBozoAndJoe, action)); } @@ -420,7 +413,7 @@ public class SelfEditorRelationshipPolicyTest extends AbstractTestClass { @Test public void dataPropSubjectIsNotIce() { action = new AddDataPropertyStatement(ontModel, URI_PERMITTED_RESOURCE, - URI_PERMITTED_PREDICATE); + URI_PERMITTED_PREDICATE, SOME_LITERAL); assertDecision(INCONCLUSIVE, policy.isAuthorized(idJoe, action)); }