if (i == -1) {
return (null);
}
- return (new String[]{uriandparams.substring(i + 1, end - 1), uriandparams.substring(end + 1)});
+ return (new String[]{uriandparams.substring(i + 1, end), uriandparams.substring(end + 1)});
}
/**
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
import org.powermock.modules.junit4.PowerMockRunner;
import java.io.IOException;
import java.io.StringReader;
@RunWith(PowerMockRunner.class)
+@SuppressStaticInitializationFor({"org.onap.dmaap.datarouter.node.ProvData", "org.onap.dmaap.datarouter.node.NodeUtils"})
public class NodeConfigTest {
private static NodeConfig nodeConfig;
--- /dev/null
+/*******************************************************************************
+ * ============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 org.onap.dmaap.datarouter.node;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+@RunWith(PowerMockRunner.class)
+@SuppressStaticInitializationFor("org.onap.dmaap.datarouter.node.NodeUtils")
+public class NodeUtilsTest {
+
+ @Test
+ public void Given_Uri_With_Params_Then_Get_Feed_And_File_Id_Returns_Correct_Values() {
+ String uri = "prov.datarouternew.com:8443/feed/12/fileName";
+ String[] uriParams = NodeUtils.getFeedAndFileID(uri);
+ Assert.assertEquals("12", uriParams[0]);
+ Assert.assertEquals("fileName", uriParams[1]);
+ }
+
+ @Test
+ public void Given_Uri_With_Illegal_Params_Then_Get_Feed_And_File_Id_Returns_Null() {
+ String uri = "prov.datarouternew.com:8443/feed";
+ String[] uriParams = NodeUtils.getFeedAndFileID(uri);
+ Assert.assertNull(uriParams);
+ }
+
+ @Test
+ public void Given_String_With_Escape_Fields_Then_Loge_Returns_Special_Chars() {
+ String s = NodeUtils.loge("\\search|pub|12\n");
+ Assert.assertEquals("\\esearch\\ppub\\p12\\n", s);
+ }
+
+ @Test
+ public void Given_String_With_Special_Chars_Then_Loge_Returns_String_With_Escape_Fields() {
+ String s = NodeUtils.unloge("\\esearch\\ppub\\p12\\n");
+ Assert.assertEquals("\\search|pub|12\n", s);
+ }
+}
--- /dev/null
+/*******************************************************************************
+ * ============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 org.onap.dmaap.datarouter.node;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(PowerMockRunner.class)
+@SuppressStaticInitializationFor("org.onap.dmaap.datarouter.node.NodeConfigManager")
+@PrepareForTest(StatusLog.class)
+public class StatusLogTest {
+
+ @Before
+ public void setUp() {
+ PowerMockito.mockStatic(NodeConfigManager.class);
+ NodeConfigManager config = mock(NodeConfigManager.class);
+ when(config.getEventLogInterval()).thenReturn("5m");
+ when(config.getEventLogPrefix()).thenReturn("logFile");
+ when(config.getEventLogSuffix()).thenReturn(".log");
+ PowerMockito.when(NodeConfigManager.getInstance()).thenReturn(config);
+ PowerMockito.mockStatic(System.class);
+ PowerMockito.when(System.currentTimeMillis()).thenReturn(1535367126000L);
+ }
+
+ @Test
+ public void Given_Time_Interval_Parse_Interval_Returns_Correct_Value() {
+ long parsedTime = StatusLog.parseInterval("2h24m35s", 1);
+ Assert.assertEquals(8640000, parsedTime);
+ }
+
+ @Test
+ public void Given_Time_Interval_In_Seconds_Parse_Interval_Returns_Correct_Value() {
+ long parsedTime = StatusLog.parseInterval("56784", 1);
+ Assert.assertEquals(43200000, parsedTime);
+ }
+
+ @Test
+ public void Validate_Get_Cur_Log_File_Returns_Correct_File_Name() {
+ String logFile = StatusLog.getCurLogFile();
+ Assert.assertTrue(logFile.matches("logFile-201808271[0-1]50.log"));
+ }
+}
* * org.onap.dmaap\r
* * ===========================================================================\r
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
- * * ===========================================================================\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
*/\r
public abstract class NodeClass extends Syncable {\r
private static Map<String, Integer> map;\r
-\r
+ private static Logger intLogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
public NodeClass() {\r
// init on first use\r
if (map == null) {\r
nextid = n + 1;\r
}\r
// take | separated list, add domain if needed.\r
- Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
+\r
for (String node : nodes) {\r
node = normalizeNodename(node);\r
if (!map.containsKey(node)) {\r
- intlogger.info("..adding " + node + " to NODES with index " + nextid);\r
+ intLogger.info("..adding " + node + " to NODES with index " + nextid);\r
map.put(node, nextid);\r
PreparedStatement ps = null;\r
try {\r
ps.close();\r
db.release(conn);\r
} catch (SQLException e) {\r
- intlogger.warn("PROV0005 doInsert: " + e.getMessage());\r
- e.printStackTrace();\r
+ intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
} finally {\r
try {\r
- ps.close();\r
+ if(ps!=null){\r
+ ps.close();\r
+ }\r
} catch (SQLException e) {\r
- e.printStackTrace();\r
+ intLogger.error("Error in closing PreparedStatement: " + e.getMessage(),e);\r
}\r
}\r
nextid++;\r
ps.close();\r
db.release(conn);\r
} catch (SQLException e) {\r
- e.printStackTrace();\r
+ intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
} finally {\r
try {\r
- ps.close();\r
+ if(ps!=null){\r
+ ps.close();\r
+ }\r
+\r
} catch (SQLException e) {\r
- e.printStackTrace();\r
+ intLogger.error("PROV0005 doInsert: " + e.getMessage(),e);\r
}\r
}\r
map = m;\r
}\r
\r
- public static Integer lookupNodeName(final String name) throws IllegalArgumentException {\r
+ public static Integer lookupNodeName(final String name) {\r
Integer n = map.get(name);\r
if (n == null)\r
throw new IllegalArgumentException("Invalid node name: " + name);\r
return n;\r
}\r
\r
- public static Collection<String> lookupNodeNames(String patt) throws IllegalArgumentException {\r
+ public static Collection<String> lookupNodeNames(String patt) {\r
Collection<String> coll = new TreeSet<String>();\r
final Set<String> keyset = map.keySet();\r
for (String s : patt.toLowerCase().split(",")) {\r
String domain = p.getValue();\r
s += "." + domain;\r
}\r
+ return s.toLowerCase();\r
}\r
- return s.toLowerCase();\r
+ else{\r
+ return s;\r
+ }\r
+\r
}\r
}\r
Code Review / dmaap / datarouter.git / commitdiff