You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/08/18 08:08:12 UTC
[pulsar] branch master updated: [fix][flaky-test] Fix DefaultMessageFormatter.formatMessage (#17104)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 3c3ec49851a [fix][flaky-test] Fix DefaultMessageFormatter.formatMessage (#17104)
3c3ec49851a is described below
commit 3c3ec49851a05484ef917f0e6d44393c40196ba3
Author: Cong Zhao <zh...@apache.org>
AuthorDate: Thu Aug 18 16:08:05 2022 +0800
[fix][flaky-test] Fix DefaultMessageFormatter.formatMessage (#17104)
---
.../org/apache/pulsar/testclient/DefaultMessageFormatter.java | 11 ++++-------
.../apache/pulsar/testclient/TestDefaultMessageFormatter.java | 7 +++----
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
index 4b686b8bb7e..e76166dbe47 100644
--- a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
+++ b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
@@ -94,14 +94,11 @@ public class DefaultMessageFormatter implements IMessageFormatter {
}
private String getIntValue(float size) {
- int i = 0;
- if (size != 0) {
- i = (int) get_FloatValue(size);
- }
- if (i == 0) {
- i = r.nextInt() + 1;
+ if (size == 0) {
+ return String.valueOf(r.nextInt());
}
- return String.valueOf(i);
+
+ return String.valueOf((int) get_FloatValue(size));
}
private String getLongValue(float size) {
if (size == 0) {
diff --git a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
index 255f2665107..89bb0251567 100644
--- a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
+++ b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
@@ -19,12 +19,11 @@
package org.apache.pulsar.testclient;
import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.nio.charset.StandardCharsets;
import org.testng.Assert;
import org.testng.annotations.Test;
-import java.nio.charset.StandardCharsets;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
public class TestDefaultMessageFormatter {
@Test
@@ -65,7 +64,7 @@ public class TestDefaultMessageFormatter {
Assert.assertTrue(l3 > 0);
Assert.assertTrue(l3 <= 99999);
Assert.assertTrue(i2 < 10);
- Assert.assertTrue(0 < i2, "i2 was " + i2);
+ Assert.assertTrue(0 <= i2, "i2 was " + i2);
Assert.assertTrue(f2 < 100000);
Assert.assertTrue( -100000 < f2);
}