Merge pull request #6882 from ORCID/FixUnitTests

Add url to summary

Author: cryptalith

orcid-core/src/test/java/org/orcid/pojo/ajaxForm/AffiliationFormTest.java

@@ -20,8 +20,9 @@ public void equalsTest() {
     public void fromAffiliationSummaryTest() {
         AffiliationForm f1 = getAffiliationForm();
         AffiliationSummary s1 = getAffiliationSummary();
-        // Summary doesn't have url
-        f1.setUrl(new Text());
+        
+        AffiliationForm f2 = AffiliationForm.valueOf(s1);
+        f2.equals(f1);
         assertEquals(f1, AffiliationForm.valueOf(s1));
     }
 

orcid-core/src/test/java/org/orcid/pojo/ajaxForm/AffiliationFormTestBase.java

@@ -160,7 +160,7 @@ protected AffiliationSummary getAffiliationSummary() {
         aff.setLastModifiedDate(new LastModifiedDate(lastModified));
         aff.setPutCode(1L);
         aff.setPath("/distinction/1");
-        
+        aff.setUrl(new Url("https://test.orcid.org"));
         aff.setDepartmentName("department-name");
         aff.setDisplayIndex("0");
         aff.setEndDate(new FuzzyDate(new Year(2018), new Month(1), new Day(1)));

orcid-core/src/test/java/org/orcid/pojo/ajaxForm/AffiliationGroupFormTest.java

@@ -120,7 +120,7 @@ private AffiliationSummary getAff2() {
 
     private AffiliationForm getForm1() {
         AffiliationForm affForm = getAffiliationForm();
-        affForm.setUrl(new Text());
+        affForm.setUrl(Text.valueOf("https://test.orcid.org"));
         affForm.setPutCode(Text.valueOf(2L));
 
         Visibility v = new Visibility();
@@ -139,7 +139,7 @@ private AffiliationForm getForm1() {
 
     private AffiliationForm getForm2() {
         AffiliationForm affForm = getAffiliationForm();
-        affForm.setUrl(new Text());
+        affForm.setUrl(Text.valueOf("https://test.orcid.org"));
         affForm.setPutCode(Text.valueOf(1L));
 
         Visibility v = new Visibility();