#21282 feedback done

dotCMS · Jan 20, 2022 · 377548d · 377548d
1 parent 52f6855
commit 377548d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/dotCMS/src/integration-test/java/com/dotcms/MainSuite.java b/dotCMS/src/integration-test/java/com/dotcms/MainSuite.java
@@ -32,6 +32,7 @@
 import com.dotcms.enterprise.publishing.remote.handler.HandlerUtilTest;
 import com.dotcms.enterprise.publishing.staticpublishing.StaticPublisherIntegrationTest;
 import com.dotcms.enterprise.rules.RulesAPIImplIntegrationTest;
+import com.dotcms.filters.interceptor.meta.MetaWebInterceptorTest;
 import com.dotcms.graphql.DotGraphQLHttpServletTest;
 import com.dotcms.integritycheckers.HostIntegrityCheckerTest;
 import com.dotcms.junit.MainBaseSuite;
@@ -496,6 +497,7 @@
         Task211012AddCompanyDefaultLanguageTest.class,
         StaticPublisherIntegrationTest.class,
         HostIntegrityCheckerTest.class,
+        MetaWebInterceptorTest.class,
         BrowserUtilTest.class,
         Task211101AddContentletAsJsonColumnTest.class,
         ContentletJsonAPITest.class,

diff --git a/...src/integration-test/java/com/dotcms/filters/interceptor/meta/MetaWebInterceptorTest.java b/...src/integration-test/java/com/dotcms/filters/interceptor/meta/MetaWebInterceptorTest.java
@@ -68,14 +68,18 @@ public void check_header_x_dot_server()  {
     @Test
     public void check_header_x_dot_server_config_disable()  {
 
-        Config.setProperty(ResponseMetaDataWebInterceptor.RESPONSE_HEADER_ADD_NODE_ID, false);
-        final ResponseMetaDataWebInterceptor metaWebInterceptor = new ResponseMetaDataWebInterceptor();
-        final MockHeaderResponse mockHeaderResponse = new MockHeaderResponse(response);
-        metaWebInterceptor.intercept(request, mockHeaderResponse);
-
-        final String header = mockHeaderResponse.getHeader(ResponseMetaDataWebInterceptor.X_DOT_SERVER_HEADER);
-        Assert.assertNull(header);
-        Config.setProperty(ResponseMetaDataWebInterceptor.RESPONSE_HEADER_ADD_NODE_ID, true);
+        try {
+            Config.setProperty(ResponseMetaDataWebInterceptor.RESPONSE_HEADER_ADD_NODE_ID, false);
+            final ResponseMetaDataWebInterceptor metaWebInterceptor = new ResponseMetaDataWebInterceptor();
+            final MockHeaderResponse mockHeaderResponse = new MockHeaderResponse(response);
+            metaWebInterceptor.intercept(request, mockHeaderResponse);
+
+            final String header = mockHeaderResponse.getHeader(ResponseMetaDataWebInterceptor.X_DOT_SERVER_HEADER);
+            Assert.assertNull(header);
+        } finally {
+
+            Config.setProperty(ResponseMetaDataWebInterceptor.RESPONSE_HEADER_ADD_NODE_ID, true);
+        }
     }
 
 
@@ -88,14 +92,18 @@ public void check_header_x_dot_server_config_disable()  {
     @Test
     public void check_header_x_dot_server_config_disable_node_name()  {
 
-        Config.setProperty(ResponseMetaDataWebInterceptor.RESPONSE_HEADER_ADD_NODE_ID_INCLUDE_NODE_NAME, false);
-        final ResponseMetaDataWebInterceptor metaWebInterceptor = new ResponseMetaDataWebInterceptor();
-        final MockHeaderResponse mockHeaderResponse = new MockHeaderResponse(response);
-        metaWebInterceptor.intercept(request, mockHeaderResponse);
+        try {
+            Config.setProperty(ResponseMetaDataWebInterceptor.RESPONSE_HEADER_ADD_NODE_ID_INCLUDE_NODE_NAME, false);
+            final ResponseMetaDataWebInterceptor metaWebInterceptor = new ResponseMetaDataWebInterceptor();
+            final MockHeaderResponse mockHeaderResponse = new MockHeaderResponse(response);
+            metaWebInterceptor.intercept(request, mockHeaderResponse);
 
-        final String header = mockHeaderResponse.getHeader(ResponseMetaDataWebInterceptor.X_DOT_SERVER_HEADER);
-        Assert.assertNotNull(header);
-        Assert.assertTrue(header.startsWith("unknown|"));
-        Config.setProperty(ResponseMetaDataWebInterceptor.RESPONSE_HEADER_ADD_NODE_ID_INCLUDE_NODE_NAME, true);
+            final String header = mockHeaderResponse.getHeader(ResponseMetaDataWebInterceptor.X_DOT_SERVER_HEADER);
+            Assert.assertNotNull(header);
+            Assert.assertTrue(header.startsWith("unknown|"));
+        } finally {
+
+            Config.setProperty(ResponseMetaDataWebInterceptor.RESPONSE_HEADER_ADD_NODE_ID, true);
+        }
     }
 }