fix unit tests

europeana · Nov 13, 2024 · cebf14f · cebf14f
1 parent b74bbdb
commit cebf14f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/...finitions/src/main/java/eu/europeana/set/definitions/model/vocabulary/SetPageProfile.java b/...finitions/src/main/java/eu/europeana/set/definitions/model/vocabulary/SetPageProfile.java
@@ -20,6 +20,7 @@ public enum SetPageProfile implements UserSetProfile{
   SetPageProfile(String profileParamValue, List<String> aliases,  String ldPreference, String preferenceApplied) {
     this.aliases = aliases;
     this.profileParamValue = profileParamValue;
+    this.ldPreference = ldPreference;
     this.preferenceApplied = preferenceApplied;
   }
 
@@ -36,9 +37,9 @@ public String getPreferenceApplied() {
     return preferenceApplied;
   }
 
-  public static SetPageProfile getByLdProfile(String ldProfile) {
+  public static SetPageProfile getByLdPreference(String ldPreference) {
     for(SetPageProfile profile : SetPageProfile.values()) {
-      if(profile.getProfileParamValue() != null && profile.getProfileParamValue().equals(ldProfile)) {
+      if(profile.getLdPreference() != null && profile.getLdPreference().equals(ldPreference)) {
         return profile;
       }
     }

diff --git a/...nitions/src/main/java/eu/europeana/set/definitions/model/vocabulary/SetProfileHelper.java b/...nitions/src/main/java/eu/europeana/set/definitions/model/vocabulary/SetProfileHelper.java
@@ -30,7 +30,7 @@ private boolean hasNameOrAlias(String urlParamValue, UserSetProfile profile) {
   public List<SetPageProfile> getSetPageProfiles(String profileStr, String preferHeader) throws UserSetProfileValidationException {
     List<SetPageProfile> setPageProfiles = new ArrayList<>();
 
-    if (StringUtils.isEmpty(profileStr)) {
+    if (StringUtils.isEmpty(preferHeader) && StringUtils.isEmpty(profileStr)) {
       //quick return if empty
       return setPageProfiles;
     }
@@ -57,7 +57,7 @@ private void parsePreferHeader(String preferHeader,  List<SetPageProfile> setPag
       throw new UserSetProfileValidationException("Cannot extract profile specification from prefer header: " + preferHeader);
     }
 
-    SetPageProfile profile = SetPageProfile.getByLdProfile(ldProfile);  
+    SetPageProfile profile = SetPageProfile.getByLdPreference(ldProfile);  
     if(profile == null) {
       throw new UserSetProfileValidationException("Invalid profile required through prefer header: " + ldProfile); 
     }

diff --git a/set-web/src/main/java/eu/europeana/set/web/service/controller/BaseRest.java b/set-web/src/main/java/eu/europeana/set/web/service/controller/BaseRest.java
@@ -47,6 +47,7 @@
 import eu.europeana.set.definitions.model.vocabulary.SetProfileHelper;
 import eu.europeana.set.definitions.model.vocabulary.SetResourceProfile;
 import eu.europeana.set.stats.service.UsageStatsService;
+import eu.europeana.set.web.config.UserSetI18nConstants;
 import eu.europeana.set.web.http.UserSetHttpHeaders;
 import eu.europeana.set.web.model.search.CollectionPage;
 import eu.europeana.set.web.search.UserSetLdSerializer;
@@ -131,9 +132,13 @@ protected List<SetPageProfile> getProfilesFromRequest(String profile, HttpServle
       try {
         profiles = getProfileHelper().getSetPageProfiles(profile, preferHeader);
       } catch (UserSetProfileValidationException e) {
-        String paramValue = StringUtils.isNotEmpty(preferHeader)? preferHeader : profile;
-        throw new ParamValidationException(I18nConstants.INVALID_PARAM_VALUE,
-            I18nConstants.INVALID_PARAM_VALUE, new String[] {CommonApiConstants.QUERY_PARAM_PROFILE, paramValue}, e);
+        if(StringUtils.isNotEmpty(preferHeader)) {
+          throw new ParamValidationException(UserSetI18nConstants.INVALID_HEADER_VALUE,
+              UserSetI18nConstants.INVALID_HEADER_VALUE, new String[] {PREFER, preferHeader}, e);  
+        }else {
+          throw new ParamValidationException(I18nConstants.INVALID_PARAM_VALUE,
+            I18nConstants.INVALID_PARAM_VALUE, new String[] {CommonApiConstants.QUERY_PARAM_PROFILE, profile}, e);
+        }
       }
       return profiles;
     }

diff --git a/set-web/src/test/java/eu/europeana/set/web/service/controller/BaseRestTest.java b/set-web/src/test/java/eu/europeana/set/web/service/controller/BaseRestTest.java
@@ -16,6 +16,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
+import eu.europeana.api.commons.definitions.config.i18n.I18nConstants;
 import eu.europeana.api.commons.web.exception.HttpException;
 import eu.europeana.set.definitions.model.UserSet;
 import eu.europeana.set.definitions.model.vocabulary.ProfileConstants;
@@ -78,7 +79,8 @@ public void testGetHeaderProfileInvalidHeaderFormat() {
                 "Something went wrong, check preferHeader "
         );
 
-        assertTrue(StringUtils.equals(thrown.getMessage(), UserSetI18nConstants.INVALID_HEADER_FORMAT));
+        //assertTrue(StringUtils.equals(thrown.getMessage(), UserSetI18nConstants.INVALID_HEADER_FORMAT));
+        assertTrue(StringUtils.equals(thrown.getMessage(), UserSetI18nConstants.INVALID_HEADER_VALUE));
     }
 
     @Test