extend unit test for ParseJvmMemorySpec; handle colon

4 files changed, 18 insertions, 6 deletions

diff --git a/client/go/internal/admin/jvm/mem_options.go b/client/go/internal/admin/jvm/mem_options.go
index f58bb141587..b2a66698536 100644
--- a/client/go/internal/admin/jvm/mem_options.go
+++ b/client/go/internal/admin/jvm/mem_options.go
@@ -14,7 +14,9 @@ func (opts *Options) getOrSetHeapSize(prefix string, heapSize AmountOfMemory) Am
 	var missing bool = true
 	for _, x := range opts.jvmArgs {
 		if strings.HasPrefix(x, prefix) {
-			val, err := ParseJvmMemorySpec(strings.TrimPrefix(x, prefix))
+			x = strings.TrimPrefix(x, prefix)
+			x = strings.TrimPrefix(x, ":")
+			val, err := ParseJvmMemorySpec(x)
 			if err == nil {
 				missing = false
 				heapSize = val
diff --git a/client/go/internal/admin/jvm/memory.go b/client/go/internal/admin/jvm/memory.go
index 2ace1f4ac88..7214cbbb9dc 100644
--- a/client/go/internal/admin/jvm/memory.go
+++ b/client/go/internal/admin/jvm/memory.go
@@ -56,6 +56,7 @@ func (v AmountOfMemory) AsJvmSpec() string {
 	}
 	return fmt.Sprintf("%d%s", val, suffix)
 }
+
 func (v AmountOfMemory) String() string {
 	val := v.numBytes
 	idx := 0
diff --git a/client/go/internal/admin/jvm/memory_test.go b/client/go/internal/admin/jvm/memory_test.go
index c898606a2db..f157efeb599 100644
--- a/client/go/internal/admin/jvm/memory_test.go
+++ b/client/go/internal/admin/jvm/memory_test.go
@@ -41,10 +41,19 @@ func TestConversion(t *testing.T) {
 	result, err = ParseJvmMemorySpec("17g")
 	assert.Nil(t, err)
 	assert.Equal(t, v1, result)
+	result, err = ParseJvmMemorySpec("17G")
+	assert.Nil(t, err)
+	assert.Equal(t, v1, result)
 	result, err = ParseJvmMemorySpec("17000m")
 	assert.Nil(t, err)
 	assert.Equal(t, v2, result)
+	result, err = ParseJvmMemorySpec("17000M")
+	assert.Nil(t, err)
+	assert.Equal(t, v2, result)
 	result, err = ParseJvmMemorySpec("17000000k")
 	assert.Nil(t, err)
 	assert.Equal(t, v3, result)
+	result, err = ParseJvmMemorySpec("17000000K")
+	assert.Nil(t, err)
+	assert.Equal(t, v3, result)
 }
diff --git a/client/go/internal/admin/jvm/options_test.go b/client/go/internal/admin/jvm/options_test.go
index 0f781756dde..600207db525 100644
--- a/client/go/internal/admin/jvm/options_test.go
+++ b/client/go/internal/admin/jvm/options_test.go
@@ -43,18 +43,18 @@ func TestHeapSizeMulti(t *testing.T) {
 	assert.Equal(t, aa, o.CurMinHeapSize(aa))
 	assert.Equal(t, aa, o.CurMaxHeapSize(aa))
 	assert.Equal(t, 2, len(o.jvmArgs))
-	o.AppendOption("-Xms234m")
-	o.AppendOption("-Xmx456m")
+	o.AppendOption("-Xms:234m")
+	o.AppendOption("-Xmx:456M")
 	assert.Equal(t, 4, len(o.jvmArgs))
 	assert.Equal(t, bb, o.CurMinHeapSize(aa))
 	assert.Equal(t, bb, o.CurMinHeapSize(dd))
 	assert.Equal(t, cc, o.CurMaxHeapSize(aa))
 	assert.Equal(t, cc, o.CurMaxHeapSize(dd))
-	o.AppendOption("-Xms1g")
-	o.AppendOption("-Xmx2g")
+	o.AppendOption("-Xms1G")
+	o.AppendOption("-Xmx:2g")
 	assert.Equal(t, GigaBytesOfMemory(1), o.CurMinHeapSize(aa))
 	assert.Equal(t, GigaBytesOfMemory(2), o.CurMaxHeapSize(aa))
-	o.AppendOption("-Xms16777216k")
+	o.AppendOption("-Xms:16777216K")
 	o.AppendOption("-Xmx32505856k")
 	assert.Equal(t, KiloBytesOfMemory(16777216), o.CurMinHeapSize(aa))
 	assert.Equal(t, KiloBytesOfMemory(32505856), o.CurMaxHeapSize(aa))