Skip to content

Commit 8d75e50

Browse files
Fixed unit tests & method name
1 parent b84dc4c commit 8d75e50

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/main/java/net/delirius/jmeter/backendlistener/elasticsearch/ElasticsearchBackend.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.text.ParseException;
55
import java.text.SimpleDateFormat;
66
import java.time.LocalDate;
7+
import java.time.LocalDateTime;
78
import java.time.format.DateTimeFormatter;
89
import java.util.Calendar;
910
import java.util.Date;
@@ -147,12 +148,12 @@ public Map<String, Object> getElasticData(SampleResult sr, BackendListenerContex
147148
// If built from Jenkins, add the hard-coded version to be able to compare response time
148149
// of two builds over the elapsed time
149150
if(this.buildNumber != 0) {
150-
Date elapsedTimeComparison = getElapsedDate(true);
151+
Date elapsedTimeComparison = getElapsedTime(true);
151152
if(elapsedTimeComparison != null)
152153
jsonObject.put("ElapsedTimeComparison", elapsedTimeComparison);
153154
}
154155

155-
Date elapsedTime = getElapsedDate(false);
156+
Date elapsedTime = getElapsedTime(false);
156157
if(elapsedTime != null)
157158
jsonObject.put("ElapsedTime", elapsedTime);
158159
jsonObject.put("ResponseCode", (sr.isResponseCodeOK() &&
@@ -179,7 +180,7 @@ public Map<String, Object> getElasticData(SampleResult sr, BackendListenerContex
179180
return jsonObject;
180181
}
181182

182-
public Date getElapsedDate(boolean forBuildComparison) {
183+
public Date getElapsedTime(boolean forBuildComparison) {
183184
String sElapsed;
184185
//Calculate the elapsed time (Starting from midnight on a random day - enables us to compare of two loads over their duration)
185186
long start = JMeterContextService.getTestStartTime();
@@ -200,7 +201,7 @@ public Date getElapsedDate(boolean forBuildComparison) {
200201
cal.get(Calendar.SECOND));
201202
} else {
202203
sElapsed = String.format("%s %02d:%02d:%02d",
203-
DateTimeFormatter.ofPattern("yyyy-mm-dd").format(LocalDate.now()),
204+
DateTimeFormatter.ofPattern("yyyy-mm-dd").format(LocalDateTime.now()),
204205
cal.get(Calendar.HOUR_OF_DAY),
205206
cal.get(Calendar.MINUTE),
206207
cal.get(Calendar.SECOND));

src/test/java/net/delirius/jmeter/backendlistener/elasticsearch/TestElasticSearchBackend.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public void setUp() throws Exception {
2929
@Test
3030
public void testGetElapsedTime() throws Exception {
3131
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
32-
Date testDate = this.instance.getElapsedDate(false);
32+
Date testDate = this.instance.getElapsedTime(false);
3333
assertNotNull("testDate = " + sdf.format(testDate), sdf.format(testDate));
3434
}
3535

3636
@Test
3737
public void testGetElapsedTimeJenkins() throws Exception {
3838
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
39-
Date testDate = this.instance.getElapsedDate(true);
39+
Date testDate = this.instance.getElapsedTime(true);
4040
assertNotNull("testDate = " + sdf.format(testDate), sdf.format(testDate));
4141
}
4242
}

0 commit comments

Comments
 (0)