You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/09/26 21:21:01 UTC

[jmeter] branch master updated (6fd5e73 -> 2d5706b)

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.


    from 6fd5e73  Cleaned up Template#equals and added more tests.
     new 52b3d51  Remove hashcode inequality tests because hashcodes might collide by accident
     new 2d5706b  Used concat instead of String.format and removed extra space.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/jmeter/gui/action/template/TestTemplateManager.java    | 8 --------
 .../java/org/apache/commons/cli/avalon/CLOptionDescriptor.java    | 3 +--
 2 files changed, 1 insertion(+), 10 deletions(-)


[jmeter] 01/02: Remove hashcode inequality tests because hashcodes might collide by accident

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 52b3d51c90f819ae773256ce8ef41413e0ceefe5
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri Sep 27 00:20:32 2019 +0300

    Remove hashcode inequality tests because hashcodes might collide by accident
    
    https://jqno.nl/equalsverifier/ should be used to verify equals vs hashCode consistency
---
 .../apache/jmeter/gui/action/template/TestTemplateManager.java    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
index 68ff67e..10edf0e 100644
--- a/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
+++ b/src/components/src/test/java/org/apache/jmeter/gui/action/template/TestTemplateManager.java
@@ -114,13 +114,6 @@ public class TestTemplateManager extends JMeterTestCase {
         assertNotEquals(testTemplate2, testTemplate3);
         assertNotEquals(testTemplate3, testTemplate1);
         assertNotEquals(testTemplate3, testTemplate2);
-
-        assertNotEquals(testTemplate1.hashCode(), testTemplate2.hashCode());
-        assertNotEquals(testTemplate1.hashCode(), testTemplate3.hashCode());
-        assertNotEquals(testTemplate2.hashCode(), testTemplate1.hashCode());
-        assertNotEquals(testTemplate2.hashCode(), testTemplate3.hashCode());
-        assertNotEquals(testTemplate3.hashCode(), testTemplate1.hashCode());
-        assertNotEquals(testTemplate3.hashCode(), testTemplate2.hashCode());
     }
 
     @Test
@@ -136,6 +129,5 @@ public class TestTemplateManager extends JMeterTestCase {
         Template template2 = readTemplateFromFile().get("testTemplateWithParameters");
         template2.setParameters(Collections.singletonMap("key", "value"));
         assertNotEquals(template1, template2);
-        assertNotEquals(template1.hashCode(), template2.hashCode());
     }
 }


[jmeter] 02/02: Used concat instead of String.format and removed extra space.

Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 2d5706b734332fa5c2cca28fc670d68e71441b43
Author: Graham Russell <gr...@ham1.co.uk>
AuthorDate: Mon Sep 23 14:30:02 2019 +0100

    Used concat instead of String.format and removed extra space.
---
 .../main/java/org/apache/commons/cli/avalon/CLOptionDescriptor.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOptionDescriptor.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOptionDescriptor.java
index 27c76d6..a03c5c2 100644
--- a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOptionDescriptor.java
+++ b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLOptionDescriptor.java
@@ -170,7 +170,6 @@ public final class CLOptionDescriptor {
 
     @Override
     public final String toString() {
-        return String.format("[OptionDescriptor %s, %d, %d, %s ]",
-                this.name, this.id, this.flags, this.description);
+        return "[OptionDescriptor " + name + ", " + id + ", " + flags + ", " + description + "]";
     }
 }