Merge pull request #12095 from IQSS/11968-compare-versions-license

11968 compare versions differences for license changes.

Author: ChengShi-1

src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java

@@ -224,7 +224,13 @@ private void getTermsDifferences() {
             logger.warning("New version does not have TermsOfUseAndAccess");
             newTerms = new TermsOfUseAndAccess();
         }
-        
+
+        //get license name or bundle val for none to test for differences
+        String originalLicenseName = originalTerms.getLicense() != null ? originalTerms.getLicense().getName() : BundleUtil.getStringFromBundle("license.none.chosen");
+        String newLicenseName = newTerms.getLicense() != null ? newTerms.getLicense().getName() : BundleUtil.getStringFromBundle("license.none.chosen");
+
+        checkAndAddToChangeList(originalLicenseName, newLicenseName,
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.license"));        
         checkAndAddToChangeList(originalTerms.getTermsOfUse(), newTerms.getTermsOfUse(),
                 BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header"));
         checkAndAddToChangeList(originalTerms.getConfidentialityDeclaration(), newTerms.getConfidentialityDeclaration(),

src/test/java/edu/harvard/iq/dataverse/DatasetVersionDifferenceTest.java

@@ -57,6 +57,10 @@ public void testDifferencing() {
                 "You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.",
                 URI.create("http://creativecommons.org/publicdomain/zero/1.0"), URI.create("/resources/images/cc0.png"),
                 true, 1l);
+        License license2 = new License("CC BY 4.0",
+                "Share — copy and redistribute the material in any medium or format for any purpose, even commercially.",
+                URI.create("https://creativecommons.org/licenses/by/4.0/"), URI.create("/resources/images/cc0.png"),
+                true, 2l);
         license.setDefault(true);
         dataset.setProtocol("doi");
         dataset.setAuthority("10.5072/FK2");
@@ -66,9 +70,12 @@ public void testDifferencing() {
         datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
         datasetVersion.setVersionNumber(1L);
         datasetVersion.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+        datasetVersion.getTermsOfUseAndAccess().setLicense(license);
         DatasetVersion datasetVersion2 = new DatasetVersion();
         datasetVersion2.setDataset(dataset);
         datasetVersion2.setVersionState(DatasetVersion.VersionState.DRAFT);
+        datasetVersion2.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+        datasetVersion2.getTermsOfUseAndAccess().setLicense(license);
 
         // Published version's two files
         DataFile dataFile = new DataFile();
@@ -163,13 +170,15 @@ public void testDifferencing() {
         // Set the published version's TermsOfUseAndAccess to a non-null value
         TermsOfUseAndAccess termsOfUseAndAccess = new TermsOfUseAndAccess();
         datasetVersion.setTermsOfUseAndAccess(termsOfUseAndAccess);
+        datasetVersion.getTermsOfUseAndAccess().setLicense(license);
 
         compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
                 expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
 
         // Set the draft version's TermsOfUseAndAccess to a non-null value
 
         datasetVersion2.setTermsOfUseAndAccess(new TermsOfUseAndAccess());
+        datasetVersion2.getTermsOfUseAndAccess().setLicense(license);
 
         compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
                 expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
@@ -194,6 +203,21 @@ public void testDifferencing() {
 
         compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
                 expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
+        
+        // Change License in Draft version
+
+        datasetVersion2.getTermsOfUseAndAccess().setLicense(license2);
+        datasetVersion2.getTermsOfUseAndAccess().setTermsOfUse("");
+        datasetVersion.getTermsOfUseAndAccess().setDisclaimer("");
+        
+        String[] termField3 = new String[] {
+                BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.license"),
+                "CC0 1.0", "CC BY 4.0" };
+        changedTerms = new ArrayList<>();
+        changedTerms.add(termField3);
+        
+        compareResults(datasetVersion, datasetVersion2, expectedAddedFiles, expectedRemovedFiles,
+                expectedChangedFileMetadata, expectedChangedVariableMetadata, expectedReplacedFiles, changedTerms);
 
     }