litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates for enabling autocomplete editing and n3editing to work.

Browse source
This commit is contained in:
hjkhjk54 2012-03-15 17:39:56 +00:00
parent 2a9c82e7ac
commit 185475a321
2 changed files with 83 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
View file

@ -15,6 +15,8 @@ public class EditConfigurationConstants {
/** Constants used by edit configuration */
//forces creation of new uri if present
public static final String NEW_URI_SENTINEL = ">NEW URI REQUIRED<";
public static final String BLANK_SENTINEL = ">SUBMITTED VALUE WAS BLANK<";
//For freemarker configuration
public static Map<String, String> exportConstants() {
Map<String, String> constants = new HashMap<String, String>();

81
webapp/test/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java
View file

@ -9,9 +9,12 @@ import java.util.Map;
import static org.junit.Assert.*;
import org.junit.Test;
import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
@ -297,6 +300,84 @@ public class ProcessRdfFormTest extends AbstractTestClass{
}
/* An edit of an existing statement set where some statements need to be replaced while
* others must be retained. */
@Test
public void basicEditReplaceStatement() throws Exception{
String testXURI = "http://test.com/uriX";
String testYURI = "http://test.com/uriY";
String testZURIOrginal = "http://test.com/uriZ";
String testZURIChanged = "http://test.com/uriZChanged";
String zType = "http://test.com/TestType";
String rdfsLabel = "http://www.w3.org/2000/01/rdf-schema#label";
/* set up model */
Model model = ModelFactory.createDefaultModel();
//?x ?y ?zOriginal.
model.add(model.createResource(testXURI),
model.createProperty(testYURI),
model.createResource(testZURIOrginal));
//?zOriginal a TestType.
model.add(model.createResource(testZURIOrginal),
RDF.type,
model.createResource(zType));
//?zOriginal label "zLabel";
model.add(model.createResource(testZURIOrginal),
RDFS.label,
model.createLiteral("Z Original Label"));
/* set up EditConfiguration */
EditConfigurationVTwo config = new EditConfigurationVTwo();
config.setEditKey("mockEditKey");
config.setLiteralsOnForm(Arrays.asList("zLabel"));
config.setUrisOnform(Arrays.asList("testX", "testY", "testZ"));
config.setN3Required( Arrays.asList("?testX ?testY ?testZ ." ));
config.setN3Optional( Arrays.asList("?testZ a <" + zType + "> . \n" +
"?testZ <" + rdfsLabel + "> ?zLabel ." ));
//mimicking an existing value for the label
config.addLiteralInScope("zLabel", model.createLiteral("Z Original Label"));
config.setVarNameForSubject("testX");
config.setSubjectUri(testXURI);
config.setPredicateUri(testYURI);
config.setVarNameForPredicate("testY");
config.setObject(testZURIOrginal);
config.setVarNameForObject("testZ");
config.addField(new FieldVTwo().setName("zLabel"));
config.prepareForObjPropUpdate(model);
/* set up Submission */
Map<String,String[]> values = new HashMap<String, String[]>();
values.put("testZ", (new String[] {testZURIChanged}));
values.put("zLabel", (new String[] {"New Z Label"}));
values.put("editKey", (new String[] {"mockEditKey"}));
MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config);
ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());
AdditionsAndRetractions changes = processor.process( config, submission );
assertNotNull( changes );
assertNotNull( changes.getAdditions() );
assertNotNull( changes.getRetractions());
// assertTrue( changes.getAdditions().size() == 3 );
//only one statement should be retracted
// assertTrue( changes.getRetractions().size() == 1 );
assertTrue( changes.getAdditions().contains(
ResourceFactory.createResource(testXURI),
ResourceFactory.createProperty(testYURI),
ResourceFactory.createResource(testZURIChanged)));
assertTrue( changes.getRetractions().contains(
ResourceFactory.createResource(testXURI),
ResourceFactory.createProperty(testYURI),
ResourceFactory.createResource(testZURIOrginal)));
}
String NEWURI_STRING= "http://newURI/n";