refactor: fix tests for useCompressedOops and max heap size

Author: kcpeppe

HyperAlloc/src/main/java/com/amazon/corretto/benchmark/hyperalloc/SimpleRunConfig.java

@@ -20,7 +20,7 @@ public class SimpleRunConfig {
     private boolean useCompressedOops;
     private int pruneRatio = ObjectStore.DEFAULT_PRUNE_RATIO;
     private int reshuffleRatio = ObjectStore.DEFAULT_RESHUFFLE_RATIO;
-    private int heapSizeInMb = (int)(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getCommitted() / 1048576L);
+    private int heapSizeInMb = (int)(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax() / 1048576L);
     private String logFile = "output.csv";
     private String allocationLogFile = null;
     private Double allocationSmoothnessFactor = null;
@@ -117,7 +117,6 @@ public SimpleRunConfig(final long allocRateInMbPerSecond, final double allocSmoo
                            final String allocationLogFile, final double rampUpSeconds) {
         this.allocRateInMbPerSecond = allocRateInMbPerSecond;
         this.allocationSmoothnessFactor = allocSmoothnessFactor;
-        this.heapSizeInMb = heapSizeInMb;
         this.longLivedInMb = longLivedInMb;
         this.midAgedInMb = midAgedInMb;
         this.durationInSecond = durationInSecond;
@@ -126,7 +125,6 @@ public SimpleRunConfig(final long allocRateInMbPerSecond, final double allocSmoo
         this.maxObjectSize = maxObjectSize;
         this.pruneRatio = pruneRatio;
         this.reshuffleRatio = reshuffleRatio;
-        this.useCompressedOops = useCompressedOops;
         this.logFile = logFile;
         this.allocationLogFile = allocationLogFile;
         this.rampUpSeconds = rampUpSeconds;

HyperAlloc/src/test/java/com/amazon/corretto/benchmark/hyperalloc/SimpleRunConfigTest.java

@@ -2,14 +2,29 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.amazon.corretto.benchmark.hyperalloc;
 
+import com.sun.management.HotSpotDiagnosticMXBean;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.lang.management.ManagementFactory;
+
 import static com.github.stefanbirkner.systemlambda.SystemLambda.catchSystemExit;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.jupiter.api.Assertions.*;
 
 class SimpleRunConfigTest {
+
+    // value will change depending on how much memory the test machine has.
+    int maxHeap = (int)(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax() / 1048576L);
+    boolean useCompressedOops;
+
+    {
+        HotSpotDiagnosticMXBean mxBeanServer = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
+        useCompressedOops = Boolean.parseBoolean(mxBeanServer.getVMOption("UseCompressedOops").getValue());
+    }
+
     @Test
     void DefaultStringsTest() {
         final SimpleRunConfig config = new SimpleRunConfig(new String[0]);
@@ -19,7 +34,7 @@ void DefaultStringsTest() {
         assertThat(config.getDurationInSecond(), is(60));
         assertThat(config.getMaxObjectSize(), is(1024));
         assertThat(config.getMinObjectSize(), is(128));
-        assertThat(config.getHeapSizeInMb(), is(1024));
+        assertThat(config.getHeapSizeInMb(), is(maxHeap));
         assertThat(config.getLongLivedInMb(), is(64));
         assertThat(config.getMidAgedInMb(), is(64));
         assertThat(config.getPruneRatio(), is(50));
@@ -39,13 +54,13 @@ void ConstructorTest() {
         assertThat(config.getDurationInSecond(), is(3000));
         assertThat(config.getMaxObjectSize(), is(512));
         assertThat(config.getMinObjectSize(), is(256));
-        assertThat(config.getHeapSizeInMb(), is(32768));
+        assertThat(config.getHeapSizeInMb(), is(maxHeap));
         assertThat(config.getLongLivedInMb(), is(256));
         assertThat(config.getMidAgedInMb(), is(32));
         assertThat(config.getPruneRatio(), is(10));
         assertThat(config.getReshuffleRatio(), is(20));
         assertThat(config.getLogFile(), is("nosuch.csv"));
-        assertFalse(config.isUseCompressedOops());
+        assertEquals(useCompressedOops,config.isUseCompressedOops());
     }
 
     @Test
@@ -54,26 +69,26 @@ void StringArgsTest() {
                                                                         "-d", "3000", "-m", "32", "-t", "16",
                                                                         "-f", "20", "-r", "10", "-x", "512", "-u", "simple",
                                                                         "-n", "256", "-c", "false", "-l", "nosuch.csv"});
-
         assertThat(config.getNumOfThreads(), is(16));
         assertThat(config.getAllocRateInMbPerSecond(), is(16384L));
         assertThat(config.getDurationInSecond(), is(3000));
         assertThat(config.getMaxObjectSize(), is(512));
         assertThat(config.getMinObjectSize(), is(256));
-        assertThat(config.getHeapSizeInMb(), is(32768));
+        assertThat(config.getHeapSizeInMb(), is(maxHeap));
         assertThat(config.getLongLivedInMb(), is(256));
         assertThat(config.getMidAgedInMb(), is(32));
         assertThat(config.getPruneRatio(), is(10));
         assertThat(config.getReshuffleRatio(), is(20));
         assertThat(config.getLogFile(), is("nosuch.csv"));
-        assertFalse(config.isUseCompressedOops());
+        assertEquals(useCompressedOops,config.isUseCompressedOops());
     }
 
     @Test
     void UnknownParameterShouldExitTest() throws Exception {
         int status = catchSystemExit(
                 () -> new SimpleRunConfig(new String[]{"-w", "who"}));
-
         assertThat(status, is(1));
     }
+
+    class MySecurityManager extends SecurityManager {}
 }