From 1e676559a51faf12fe4b36ca6a77cbc30ed75830 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 8 Jun 2019 13:37:28 -0700 Subject: [PATCH] GUACAMOLE-422: Correct toString() for GuacamoleProtocolVersion (must be manually implemented after migrating away from enum). Add unit test for verifying toString(). --- .../guacamole/protocol/GuacamoleProtocolVersion.java | 5 +++++ .../protocol/GuacamoleProtocolVersionTest.java | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java index d3d331d75..c1d50baca 100644 --- a/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java +++ b/guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleProtocolVersion.java @@ -202,5 +202,10 @@ public class GuacamoleProtocolVersion { && this.patch == otherVersion.getPatch(); } + + @Override + public String toString() { + return "VERSION_" + getMajor() + "_" + getMinor() + "_" + getPatch(); + } } diff --git a/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleProtocolVersionTest.java b/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleProtocolVersionTest.java index 3d3a0ebe8..d5082b5a8 100644 --- a/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleProtocolVersionTest.java +++ b/guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleProtocolVersionTest.java @@ -137,4 +137,15 @@ public class GuacamoleProtocolVersionTest { } + /** + * Verifies that versions can be converted to their Guacamole protocol + * representation through calling toString(). + */ + @Test + public void testToString() { + Assert.assertEquals("VERSION_1_0_0", GuacamoleProtocolVersion.VERSION_1_0_0.toString()); + Assert.assertEquals("VERSION_1_1_0", GuacamoleProtocolVersion.VERSION_1_1_0.toString()); + Assert.assertEquals("VERSION_12_103_398", new GuacamoleProtocolVersion(12, 103, 398).toString()); + } + }