Modified content length interceptor class.
Issue-ID: DMAAP-151
Change-Id: Ifeaa6f54032da583ec5df3b4b29078d1c4b8648a
Signed-off-by: sg481n <sg481n@att.com>
-/*******************************************************************************
- * ============LICENSE_START=======================================================
- * org.onap.dmaap
- * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *
- *******************************************************************************/
-package com.att.nsa.dmaap.util;
-
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.http.HttpStatus;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.springframework.stereotype.Component;
-import com.att.nsa.cambria.CambriaApiException;
-import com.att.nsa.cambria.exception.DMaaPResponseCode;
-import com.att.nsa.cambria.exception.ErrorResponse;
-import ajsc.beans.interceptors.AjscInterceptor;
-
-/**
- * AJSC Intercepter implementation of ContentLengthFilter
- */
-@Component
-public class ContentLengthInterceptor implements AjscInterceptor{
-
-
- private String defLength;
- private static final EELFLogger log = EELFManager.getInstance().getLogger(ContentLengthInterceptor.class);
-
-
- /**
- * Intercepter method to intercept requests before processing
- */
- @Override
- public boolean allowOrReject(HttpServletRequest httpservletrequest, HttpServletResponse httpservletresponse,
- Map map) throws Exception {
-
- log.info("inside Interceptor allowOrReject content length checking before pub/sub");
-
- JSONObject jsonObj = null;
- int requestLength = 0;
- setDefLength(System.getProperty("maxcontentlength"));
- try {
- // retrieving content length from message header
-
- if (null != httpservletrequest.getHeader("Content-Length")) {
- requestLength = Integer.parseInt(httpservletrequest.getHeader("Content-Length"));
- }
- // retrieving encoding from message header
- String transferEncoding = httpservletrequest.getHeader("Transfer-Encoding");
- // checking for no encoding, chunked and requestLength greater then
- // default length
- if (null != transferEncoding && !(transferEncoding.contains("chunked"))
- && (requestLength > Integer.parseInt(getDefLength()))) {
- jsonObj = new JSONObject().append("defaultlength", getDefLength())
- .append("requestlength", requestLength);
- log.error("message length is greater than default");
- throw new CambriaApiException(jsonObj);
- }
- else if (null == transferEncoding && (requestLength > Integer.parseInt(getDefLength())))
- {
- jsonObj = new JSONObject().append("defaultlength", getDefLength()).append(
- "requestlength", requestLength);
- log.error("Request message is not chunked or request length is greater than default length");
- throw new CambriaApiException(jsonObj);
-
-
- }
- else
- {
- //chain.doFilter(req, res);
- return true;
- }
-
- } catch (CambriaApiException | NumberFormatException | JSONException e) {
-
- log.info("Exception obj--"+e);
- log.error("message size is greater then default"+e.getMessage());
- ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_REQUEST_TOO_LONG,
- DMaaPResponseCode.MSG_SIZE_EXCEEDS_MSG_LIMIT.getResponseCode(), System.getProperty("msg_size_exceeds")
- + e.toString());
- log.info(errRes.toString());
-
-
- map.put(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,"test");
- httpservletresponse.setStatus(HttpStatus.SC_REQUEST_TOO_LONG);
- httpservletresponse.getOutputStream().write(errRes.toString().getBytes());
- return false;
- }
-
-
-
- }
-
-
- /**
- * Get Default Content Length
- * @return defLength
- */
- public String getDefLength() {
- return defLength;
- }
- /**
- * Set Default Content Length
- * @param defLength
- */
- public void setDefLength(String defLength) {
- this.defLength = defLength;
- }
-
-
-
-}
+/*******************************************************************************\r
+ * ============LICENSE_START=======================================================\r
+ * org.onap.dmaap\r
+ * ================================================================================\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+ * ================================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ * \r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END=========================================================\r
+ *\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ * \r
+ *******************************************************************************/\r
+package com.att.nsa.dmaap.util;\r
+\r
+import java.util.Map;\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
+import org.apache.http.HttpStatus;\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
+import org.json.JSONException;\r
+import org.json.JSONObject;\r
+import org.springframework.stereotype.Component;\r
+import com.att.nsa.cambria.CambriaApiException;\r
+import com.att.nsa.cambria.exception.DMaaPResponseCode;\r
+import com.att.nsa.cambria.exception.ErrorResponse;\r
+import ajsc.beans.interceptors.AjscInterceptor;\r
+\r
+/**\r
+ * AJSC Intercepter implementation of ContentLengthFilter\r
+ */\r
+@Component\r
+public class ContentLengthInterceptor implements AjscInterceptor{\r
+\r
+ \r
+ private String defLength;\r
+ private static final EELFLogger log = EELFManager.getInstance().getLogger(ContentLengthInterceptor.class);\r
+\r
+\r
+ /**\r
+ * Intercepter method to intercept requests before processing\r
+ */\r
+ @Override\r
+ public boolean allowOrReject(HttpServletRequest httpservletrequest, HttpServletResponse httpservletresponse,\r
+ Map map) throws Exception {\r
+ \r
+ log.info("inside Interceptor allowOrReject content length checking before pub/sub");\r
+ \r
+ JSONObject jsonObj = null;\r
+ int requestLength = 0;\r
+ setDefLength(System.getProperty("maxcontentlength"));\r
+ try {\r
+ // retrieving content length from message header\r
+\r
+ if (null != httpservletrequest.getHeader("Content-Length")) {\r
+ requestLength = Integer.parseInt(httpservletrequest.getHeader("Content-Length"));\r
+ }\r
+ // retrieving encoding from message header\r
+ String transferEncoding = httpservletrequest.getHeader("Transfer-Encoding");\r
+ // checking for no encoding, chunked and requestLength greater then\r
+ // default length\r
+ if (null != transferEncoding && !(transferEncoding.contains("chunked"))\r
+ && (getDefLength() !=null && requestLength > Integer.parseInt(getDefLength()))) {\r
+ jsonObj = new JSONObject().append("defaultlength", getDefLength())\r
+ .append("requestlength", requestLength);\r
+ log.error("message length is greater than default");\r
+ throw new CambriaApiException(jsonObj);\r
+ } \r
+ else if (null == transferEncoding && (getDefLength() !=null && requestLength > Integer.parseInt(getDefLength()))) \r
+ {\r
+ jsonObj = new JSONObject().append("defaultlength", getDefLength()).append(\r
+ "requestlength", requestLength);\r
+ log.error("Request message is not chunked or request length is greater than default length");\r
+ throw new CambriaApiException(jsonObj);\r
+ \r
+ \r
+ } \r
+ else \r
+ {\r
+ //chain.doFilter(req, res);\r
+ return true;\r
+ }\r
+ \r
+ } catch (CambriaApiException | NumberFormatException | JSONException e) {\r
+ \r
+ log.info("Exception obj--"+e);\r
+ log.error("message size is greater then default"+e.getMessage());\r
+ ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_REQUEST_TOO_LONG,\r
+ DMaaPResponseCode.MSG_SIZE_EXCEEDS_MSG_LIMIT.getResponseCode(), System.getProperty("msg_size_exceeds")\r
+ + e.toString());\r
+ log.info(errRes.toString());\r
+ \r
+ \r
+ map.put(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,"test");\r
+ httpservletresponse.setStatus(HttpStatus.SC_REQUEST_TOO_LONG);\r
+ httpservletresponse.getOutputStream().write(errRes.toString().getBytes());\r
+ return false;\r
+ }\r
+\r
+ \r
+ \r
+ }\r
+\r
+ \r
+ /**\r
+ * Get Default Content Length\r
+ * @return defLength\r
+ */\r
+ public String getDefLength() {\r
+ return defLength;\r
+ }\r
+ /**\r
+ * Set Default Content Length\r
+ * @param defLength\r
+ */\r
+ public void setDefLength(String defLength) {\r
+ this.defLength = defLength;\r
+ }\r
+\r
+ \r
+\r
+}\r
\r
@Test\r
public void testToResponse() {\r
- \r
+\r
DMaaPCambriaExceptionMapper mapper = new DMaaPCambriaExceptionMapper();\r
- \r
+\r
try {\r
mapper.toResponse(null);\r
- } catch(NullPointerException e) {\r
+ } catch (NullPointerException e) {\r
assertTrue(true);\r
}\r
- \r
- \r
- \r
- \r
- \r
+\r
}\r
- \r
- \r
- \r
- \r
\r
}
\ No newline at end of file
\r
@Test\r
public void testToResponse() {\r
- \r
+\r
DMaaPWebExceptionMapper mapper = new DMaaPWebExceptionMapper();\r
- \r
+\r
try {\r
mapper.toResponse(null);\r
- } catch(NullPointerException e) {\r
+ } catch (NullPointerException e) {\r
assertTrue(true);\r
}\r
- \r
- \r
- \r
- \r
- \r
+\r
}\r
- \r
- \r
- \r
- \r
\r
}
\ No newline at end of file
-/*******************************************************************************
- * ============LICENSE_START=======================================================
- * org.onap.dmaap
- * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *
- *******************************************************************************/
-package com.att.nsa.dmaap;
-
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DummyTest {
-
- @Before
- public void setUp() throws Exception {
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void test() {
- assertTrue("Dummy test case", true);
- }
-
-}
+/*******************************************************************************\r
+ * ============LICENSE_START=======================================================\r
+ * org.onap.dmaap\r
+ * ================================================================================\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+ * ================================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ * \r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END=========================================================\r
+ *\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ * \r
+ *******************************************************************************/\r
+package com.att.nsa.dmaap;\r
+\r
+import static org.junit.Assert.*;\r
+\r
+import org.junit.After;\r
+import org.junit.Before;\r
+import org.junit.Test;\r
+\r
+public class DummyTest {\r
+\r
+ @Before\r
+ public void setUp() throws Exception {\r
+ }\r
+\r
+ @After\r
+ public void tearDown() throws Exception {\r
+ }\r
+\r
+ @Test\r
+ public void test() {\r
+ assertTrue("Dummy test case", true);\r
+ }\r
+\r
+}\r
\r
@Test\r
public void testToResponse() {\r
- \r
+\r
HelloWorld hello = new HelloWorld();\r
- \r
+\r
try {\r
hello.speak(null);\r
- } catch(NullPointerException e) {\r
+ } catch (NullPointerException e) {\r
assertTrue(true);\r
}\r
- \r
- \r
+\r
}\r
- \r
- \r
- \r
- \r
\r
}
\ No newline at end of file
\r
}\r
\r
- \r
-\r
}
\ No newline at end of file
Class clazz = null;\r
Method method = null;\r
try {\r
- clazz = Class.forName("ApiKeysRestService");\r
+ clazz = Class.forName("com.att.nsa.dmaap.service.ApiKeysRestService");\r
Object obj = clazz.newInstance();\r
method = clazz.getDeclaredMethod("getDmaapContext", null);\r
method.setAccessible(true);\r
\r
package com.att.nsa.dmaap.service;\r
\r
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.assertTrue;\r
+import static org.junit.Assert.fail;\r
+import static org.mockito.Matchers.anyString;\r
+\r
+import java.io.FileInputStream;\r
\r
//import static org.mockito.Matchers.anyString;\r
//import static org.mockito.Mockito.when;\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import org.junit.After;\r
+import org.apache.commons.io.IOUtils;\r
import org.json.JSONArray;\r
import org.json.JSONException;\r
import org.json.JSONObject;\r
+import org.junit.After;\r
import org.junit.Assert;\r
import org.junit.Before;\r
import org.junit.Test;\r
-\r
import org.junit.runner.RunWith;\r
-/*import org.mockito.InjectMocks;\r
+import org.mockito.InjectMocks;\r
import org.mockito.Mock;\r
import org.mockito.MockitoAnnotations;\r
import org.powermock.api.mockito.PowerMockito;\r
import org.powermock.core.classloader.annotations.PrepareForTest;\r
-import org.powermock.modules.junit4.PowerMockRunner;*/\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
\r
import com.att.ajsc.beans.PropertiesMapBean;\r
import com.att.ajsc.filemonitor.AJSCPropertiesMap;\r
import com.att.nsa.security.NsaAcl;\r
import com.att.nsa.security.NsaApiKey;\r
import com.att.nsa.security.db.simple.NsaSimpleApiKey;\r
+import com.google.gson.Gson;\r
\r
//@RunWith(MockitoJUnitRunner.class)\r
-/*@RunWith(PowerMockRunner.class)\r
-@PrepareForTest({ PropertiesMapBean.class, AJSCPropertiesMap.class })*/\r
-public class MMRestServiceTest {/*\r
+@RunWith(PowerMockRunner.class)\r
+@PrepareForTest({ PropertiesMapBean.class, AJSCPropertiesMap.class })\r
+public class MMRestServiceTest {\r
\r
@InjectMocks\r
MMRestService mmRestService;\r
public void tearDown() throws Exception {\r
}\r
\r
-\r
@Test\r
public void testCallCreateMirrorMaker() throws DMaaPAccessDeniedException, CambriaApiException, IOException,\r
TopicExistsException, JSONException, ConfigDbException {\r
-\r
- Assert.assertNotNull(mmRestService);\r
- when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
- when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin")).thenReturn(true);\r
- when(httpServReq.isUserInRole("admin")).thenReturn(true);\r
-\r
- PowerMockito.mockStatic(AJSCPropertiesMap.class);\r
-\r
+ prepareForTestCommon();\r
+ mmRestService.callCreateMirrorMaker(iStream);\r
assertTrue(true);\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormakeradmin.aaf"))\r
- .thenReturn("admin");\r
-\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.timeout"))\r
- .thenReturn("100");\r
-\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.topic"))\r
- .thenReturn("mirrormaker.topic");\r
-\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.consumergroup"))\r
- .thenReturn("mirrormaker.consumergroup");\r
-\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.consumerid"))\r
- .thenReturn("mirrormaker.consumerid");\r
-\r
- when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
-\r
- when(httpServReq.isUserInRole("admin")).thenReturn(true);\r
- \r
-\r
- // when(httpServReq.getHeader("Authorization")).thenReturn("Admin");\r
- when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin.aaf")).thenReturn(true);\r
- when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin")).thenReturn(true);\r
- when(httpServReq.getHeader("Authorization")).thenReturn("Admin");\r
- when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin")).thenReturn(true);\r
+ }\r
\r
- when(cMirroMaker.getCreateMirrorMaker()).thenReturn(mMaker);\r
+ @Test\r
+ public void testCallListAllMirrorMaker() throws DMaaPAccessDeniedException, CambriaApiException, IOException,\r
+ TopicExistsException, JSONException, ConfigDbException {\r
+ prepareForTestCommon();\r
+ mmRestService.callListAllMirrorMaker(iStream);\r
+ assertTrue(true);\r
+ }\r
\r
- when(mMaker.getName()).thenReturn("mirroMakerName");\r
- when(dmaapContext.getConfigReader()).thenReturn(configReader);\r
- when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
- when(httpServReq.getHeader("Authorization")).thenReturn("Authorization");\r
+ @Test\r
+ public void testCallUpdateMirrorMaker() throws ConfigDbException, CambriaApiException {\r
+ prepareForTestCommon();\r
+ mmRestService.callUpdateMirrorMaker(iStream);\r
+ assertTrue(true);\r
+ }\r
\r
- when(dmaapContext.getResponse()).thenReturn(httpServRes);\r
- when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);\r
- when(httpServReq.getMethod()).thenReturn("HEAD");\r
+ @Test\r
+ public void testCallDeleteMirrorMaker() throws ConfigDbException, CambriaApiException {\r
+ prepareForTestCommon();\r
+ mmRestService.callDeleteMirrorMaker(iStream);\r
+ assertTrue(true);\r
+ }\r
\r
- when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(null);\r
+ @Test\r
+ public void testListWhiteList() throws ConfigDbException {\r
+ prepareForTestCommon();\r
+ mmRestService.listWhiteList(iStream);\r
+ assertTrue(true);\r
+ }\r
\r
- mmRestService.callCreateMirrorMaker(iStream);\r
+ @Test\r
+ public void testCreateWhiteList() throws ConfigDbException {\r
+ prepareForTestCommon();\r
+ mmRestService.createWhiteList(iStream);\r
+ assertTrue(true);\r
}\r
\r
@Test\r
- public void testCallListAllMirrorMaker() throws DMaaPAccessDeniedException, CambriaApiException, IOException,\r
- TopicExistsException, JSONException, ConfigDbException {\r
+ public void testDeleteWhiteList() throws ConfigDbException {\r
+ prepareForTestCommon();\r
+ mmRestService.deleteWhiteList(iStream);\r
+ assertTrue(true);\r
+ }\r
\r
+ private void prepareForTestCommon() throws ConfigDbException {\r
Assert.assertNotNull(mmRestService);\r
- when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
- when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin")).thenReturn(true);\r
- when(httpServReq.isUserInRole("admin")).thenReturn(true);\r
+ PowerMockito.when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+ PowerMockito.when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin")).thenReturn(true);\r
+ PowerMockito.when(httpServReq.isUserInRole("admin")).thenReturn(true);\r
\r
PowerMockito.mockStatic(AJSCPropertiesMap.class);\r
\r
assertTrue(true);\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormakeradmin.aaf"))\r
+\r
+ PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormakeradmin.aaf"))\r
+ .thenReturn("admin");\r
+\r
+ PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormakeruser.aaf"))\r
.thenReturn("admin");\r
\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.timeout"))\r
+ PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.timeout"))\r
.thenReturn("100");\r
\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.topic"))\r
+ PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.topic"))\r
.thenReturn("mirrormaker.topic");\r
\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.consumergroup"))\r
+ PowerMockito\r
+ .when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.consumergroup"))\r
.thenReturn("mirrormaker.consumergroup");\r
\r
- when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.consumerid"))\r
+ PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.mirrormaker.consumerid"))\r
.thenReturn("mirrormaker.consumerid");\r
\r
- when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+ PowerMockito.when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
\r
- when(httpServReq.isUserInRole("admin")).thenReturn(true);\r
- \r
+ PowerMockito.when(httpServReq.isUserInRole("admin")).thenReturn(true);\r
\r
- // when(httpServReq.getHeader("Authorization")).thenReturn("Admin");\r
- when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin.aaf")).thenReturn(true);\r
- when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin")).thenReturn(true);\r
- when(httpServReq.getHeader("Authorization")).thenReturn("Admin");\r
- when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin")).thenReturn(true);\r
+ // PowerMockito.when(httpServReq.getHeader("Authorization")).thenReturn("Admin");\r
+ PowerMockito.when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin.aaf")).thenReturn(true);\r
+ PowerMockito.when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin")).thenReturn(true);\r
+ PowerMockito.when(httpServReq.getHeader("Authorization")).thenReturn("Admin");\r
+ PowerMockito.when(dmaapAAFauthenticator.aafAuthentication(httpServReq, "admin")).thenReturn(true);\r
\r
- when(cMirroMaker.getCreateMirrorMaker()).thenReturn(mMaker);\r
+ PowerMockito.when(cMirroMaker.getCreateMirrorMaker()).thenReturn(mMaker);\r
\r
- when(mMaker.getName()).thenReturn("mirroMakerName");\r
- when(dmaapContext.getConfigReader()).thenReturn(configReader);\r
- when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
- when(httpServReq.getHeader("Authorization")).thenReturn("Authorization");\r
+ PowerMockito.when(mMaker.getName()).thenReturn("mirroMakerName");\r
+ PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader);\r
+ PowerMockito.when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+ PowerMockito.when(httpServReq.getHeader("Authorization")).thenReturn("Authorization");\r
\r
- when(dmaapContext.getResponse()).thenReturn(httpServRes);\r
- when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);\r
- when(httpServReq.getMethod()).thenReturn("HEAD");\r
+ PowerMockito.when(dmaapContext.getResponse()).thenReturn(httpServRes);\r
+ PowerMockito.when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);\r
+ PowerMockito.when(httpServReq.getMethod()).thenReturn("HEAD");\r
\r
- when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(null);\r
-\r
- mmRestService.callListAllMirrorMaker(iStream);\r
+ PowerMockito.when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(null);\r
}\r
\r
-\r
-*/}\r
+}\r
\r
package com.att.nsa.dmaap.util;\r
\r
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.assertTrue;\r
+\r
+import java.util.Map;\r
+\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
\r
import org.junit.After;\r
import org.junit.Before;\r
import org.junit.Test;\r
-\r
+import org.junit.runner.RunWith;\r
+import org.mockito.InjectMocks;\r
+import org.mockito.Mock;\r
+import org.powermock.api.mockito.PowerMockito;\r
+import org.powermock.core.classloader.annotations.PrepareForTest;\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+\r
+@RunWith(PowerMockRunner.class)\r
+@PrepareForTest({ System.class })\r
public class ContentLengthInterceptorTest {\r
+ @InjectMocks\r
+ ContentLengthInterceptor interceptor = null;\r
+\r
+ @Mock\r
+ Map map;\r
\r
- private ContentLengthInterceptor interceptor = null;\r
+ @Mock\r
+ HttpServletRequest req;\r
+\r
+ @Mock\r
+ HttpServletResponse res;\r
\r
@Before\r
public void setUp() throws Exception {\r
- interceptor = new ContentLengthInterceptor();\r
+ // interceptor = new ContentLengthInterceptor();\r
}\r
\r
@After\r
}\r
\r
@Test\r
- public void testAllowOrReject() {\r
-\r
- try {\r
- interceptor.allowOrReject(null, null, null);\r
- } catch (Exception e) {\r
- // TODO Auto-generated catch block\r
- e.printStackTrace();\r
- }\r
-\r
+ public void testAllowOrReject() throws Exception {\r
+ PowerMockito.when(req.getHeader("Transfer-Encoding")).thenReturn("UTF-8");\r
+ PowerMockito.when(req.getHeader("Content-Length")).thenReturn("1027");\r
+ interceptor.allowOrReject(req, res, map);\r
assertTrue(true);\r
-\r
}\r
\r
@Test\r
public void testGetDefLength() {\r
-\r
interceptor.getDefLength();\r
-\r
assertTrue(true);\r
-\r
- \r
}\r
- \r
+\r
@Test\r
public void testSetDefLength() {\r
-\r
interceptor.setDefLength("defLength");\r
-\r
assertTrue(true);\r
\r
}\r
\r
package com.att.nsa.dmaap.util;\r
\r
+import java.io.IOException;\r
+\r
+import javax.servlet.FilterChain;\r
+import javax.servlet.ServletException;\r
+import javax.servlet.ServletResponse;\r
+import javax.servlet.http.HttpServletRequest;\r
\r
import org.junit.After;\r
import org.junit.Before;\r
import org.junit.Test;\r
-\r
import org.junit.runner.RunWith;\r
-/*import org.mockito.InjectMocks;\r
+import org.mockito.InjectMocks;\r
import org.mockito.Mock;\r
import org.mockito.MockitoAnnotations;\r
+import org.powermock.api.mockito.PowerMockito;\r
import org.powermock.core.classloader.annotations.PrepareForTest;\r
import org.powermock.modules.junit4.PowerMockRunner;\r
\r
import com.att.ajsc.beans.PropertiesMapBean;\r
-import static org.mockito.Mockito.when;\r
-*/\r
-import java.io.IOException;\r
-import javax.servlet.FilterChain;\r
-import javax.servlet.ServletException;\r
-import javax.servlet.ServletResponse;\r
-import javax.servlet.http.HttpServletRequest;\r
-\r
import com.att.nsa.cambria.beans.DMaaPContext;\r
import com.att.nsa.cambria.exception.DMaaPResponseCode;\r
\r
-/*@RunWith(PowerMockRunner.class)\r
-@PrepareForTest({ PropertiesMapBean.class, DMaaPResponseCode.class })*/\r
-public class DMaaPAuthFilterTest {/*\r
- \r
+@RunWith(PowerMockRunner.class)\r
+@PrepareForTest({ PropertiesMapBean.class, DMaaPResponseCode.class })\r
+public class DMaaPAuthFilterTest {\r
+\r
@InjectMocks\r
DMaaPAuthFilter filter;\r
- \r
+\r
@Mock\r
- HttpServletRequest req; \r
- \r
+ HttpServletRequest req;\r
+\r
@Mock\r
ServletResponse res;\r
- \r
- \r
+\r
@Mock\r
FilterChain chain;\r
- \r
+\r
@Mock\r
DMaaPContext dmaapContext;\r
- \r
+\r
@Before\r
public void setUp() throws Exception {\r
MockitoAnnotations.initMocks(this);\r
\r
@Test\r
public void testDoFilter() throws IOException, ServletException {\r
- \r
- when(dmaapContext.getRequest()).thenReturn(req);\r
- when(req.getHeader("Authorization")).thenReturn("Authorization");\r
- \r
- //when(dmaapContext.getResponse()).thenReturn(res);\r
- filter.doFilter(req, res, chain);\r
\r
+ PowerMockito.when(dmaapContext.getRequest()).thenReturn(req);\r
+ PowerMockito.when(req.getHeader("Authorization")).thenReturn("Authorization");\r
+ // when(dmaapContext.getResponse()).thenReturn(res);\r
+ filter.doFilter(req, res, chain);\r
\r
}\r
- \r
+\r
@Test\r
public void testDoFilter_nullAuth() throws IOException, ServletException {\r
- \r
- when(dmaapContext.getRequest()).thenReturn(req);\r
- //when(req.getHeader("Authorization")).thenReturn("Authorization");\r
- \r
- //when(dmaapContext.getResponse()).thenReturn(res);\r
- filter.doFilter(req, res, chain);\r
\r
+ PowerMockito.when(dmaapContext.getRequest()).thenReturn(req);\r
+ PowerMockito.when(req.getHeader("Authorization")).thenReturn("Authorization");\r
+\r
+ // when(dmaapContext.getResponse()).thenReturn(res);\r
+ filter.doFilter(req, res, chain);\r
\r
}\r
\r
- \r
- \r
-*/}
\ No newline at end of file
+}
\ No newline at end of file
\r
public class ServicePropertiesMapBeanTest {\r
\r
- \r
-\r
@Before\r
public void setUp() throws Exception {\r
- \r
+\r
}\r
\r
@After\r
\r
@Test\r
public void testGetProperty() {\r
- \r
- \r
+\r
try {\r
ServicePropertiesMapBean.getProperty(null, null);\r
} catch (Exception e) {\r
- // TODO Auto-generated catch block\r
e.printStackTrace();\r
}\r
\r
\r
}\r
\r
- \r
- \r
}
\ No newline at end of file
Code Review / dmaap / messagerouter / messageservice.git / commitdiff