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

address review comments and add additional cleanup

Browse source
This commit is contained in:
Brian Lowe 2022-05-27 17:55:08 +03:00
parent 530ad7d39c
commit ce82c237a3
4 changed files with 65 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoaderTest.java
View file

@ -61,8 +61,8 @@ public class RDFFilesLoaderTest extends AbstractTestClass {
Model additionsModel = fileModel.difference(backupModel);
Model retractionsModel = backupModel.difference(fileModel);
RDFFilesLoader.checkUiChangesOverlapWithFileChanges(backupModel, userModel, additionsModel);
RDFFilesLoader.checkUiChangesOverlapWithFileChanges(backupModel, userModel, retractionsModel);
RDFFilesLoader.removeChangesThatConflictWithUIEdits(backupModel, userModel, additionsModel);
RDFFilesLoader.removeChangesThatConflictWithUIEdits(backupModel, userModel, retractionsModel);
userModel.remove(retractionsModel);
userModel.add(additionsModel);
@ -73,7 +73,6 @@ public class RDFFilesLoaderTest extends AbstractTestClass {
// have the same language tag.
assertTrue("expected: " + userModelExpected + " but was: " + userModel,
userModelExpected.isIsomorphicWith(userModel));
}
@org.junit.Test
@ -118,8 +117,8 @@ public class RDFFilesLoaderTest extends AbstractTestClass {
Model additionsModel = fileModel.difference(backupModel);
Model retractionsModel = backupModel.difference(fileModel);
RDFFilesLoader.checkUiChangesOverlapWithFileChanges(backupModel, userModel, additionsModel);
RDFFilesLoader.checkUiChangesOverlapWithFileChanges(backupModel, userModel, retractionsModel);
RDFFilesLoader.removeChangesThatConflictWithUIEdits(backupModel, userModel, additionsModel);
RDFFilesLoader.removeChangesThatConflictWithUIEdits(backupModel, userModel, retractionsModel);
userModel.remove(retractionsModel);
userModel.add(additionsModel);