From 9d57cb755f48188d15517e8e224ac6ee93b7ef6c Mon Sep 17 00:00:00 2001 From: Aleksi Simell Date: Thu, 29 Nov 2018 09:00:55 +0200 Subject: [PATCH] Add unit test for changing tag dashes to underscores --- .../JenkinsBasePointGeneratorTest.java | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/test/java/jenkinsci/plugins/influxdb/generators/JenkinsBasePointGeneratorTest.java b/src/test/java/jenkinsci/plugins/influxdb/generators/JenkinsBasePointGeneratorTest.java index 1488a9fc..e0454497 100644 --- a/src/test/java/jenkinsci/plugins/influxdb/generators/JenkinsBasePointGeneratorTest.java +++ b/src/test/java/jenkinsci/plugins/influxdb/generators/JenkinsBasePointGeneratorTest.java @@ -23,11 +23,11 @@ * @author Damien Coraboeuf */ public class JenkinsBasePointGeneratorTest { - public static final String JOB_NAME = "master"; - public static final int BUILD_NUMBER = 11; - public static final String CUSTOM_PREFIX = "test_prefix"; + private static final String JOB_NAME = "master"; + private static final int BUILD_NUMBER = 11; + private static final String CUSTOM_PREFIX = "test_prefix"; - public static final String JENKINS_ENV_PARAMETER_FIELD = + private static final String JENKINS_ENV_PARAMETER_FIELD = "testKey1=testValueField\n" + "testKey2=${incompleteEnvValueField\n" + "testEnvKeyField1=${testEnvValueField}\n" + @@ -35,14 +35,14 @@ public class JenkinsBasePointGeneratorTest { private static final String JENKINS_ENV_VALUE_FIELD = "testEnvValueField"; private static final String JENKINS_ENV_RESOLVED_VALUE_FIELD = "resolvedEnvValueField"; - public static final String JENKINS_ENV_PARAMETER_TAG = + private static final String JENKINS_ENV_PARAMETER_TAG = "testKey1=testValueTag\n" + "testKey2=${incompleteEnvValueTag\n" + "testEnvKeyTag1=${testEnvValueTag}\n" + "testEnvKeyTag2=PREFIX_${testEnvValueTag}_${testEnvValueTag}_SUFFIX"; private static final String JENKINS_ENV_VALUE_TAG = "testEnvValueTag"; private static final String JENKINS_ENV_RESOLVED_VALUE_TAG = "resolvedEnvValueTag"; - public static final String MEASUREMENT_NAME = "jenkins_data"; + private static final String MEASUREMENT_NAME = "jenkins_data"; private Run build; private MeasurementRenderer> measurementRenderer; @@ -178,4 +178,20 @@ public void custom_measurement_included() { Assert.assertTrue(lineProtocol.startsWith(customMeasurement)); } + + @Test + public void dashes_are_not_replaced_by_underscores() { + String customPrefix = "my-custom-prefix"; + measurementRenderer = new ProjectNameRenderer(customPrefix, null); + + JenkinsBasePointGenerator jenkinsBasePointGenerator = + new JenkinsBasePointGenerator(measurementRenderer, customPrefix, build, currTime, + listener, JENKINS_ENV_PARAMETER_FIELD, JENKINS_ENV_PARAMETER_TAG, + MEASUREMENT_NAME, false); + Point[] generatedPoints = jenkinsBasePointGenerator.generate(); + String lineProtocol = generatedPoints[0].lineProtocol(); + + assertThat(lineProtocol, containsString("jenkins_data,build_result=?,prefix=" + customPrefix + ",project_name=" + customPrefix+"_"+JOB_NAME)); + + } }