From d569981b902c9a877e45a8e5a688d7f5fa89b375 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Tue, 28 May 2024 21:06:49 -0500 Subject: [PATCH] Revert changes to testutils sorted primitive generators --- .../engine/testutil/generator/SortedCharGenerator.java | 8 ++++---- .../engine/testutil/generator/SortedDoubleGenerator.java | 4 ++-- .../engine/testutil/generator/SortedIntGenerator.java | 8 ++++---- .../engine/testutil/generator/SortedLongGenerator.java | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedCharGenerator.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedCharGenerator.java index 37505a8dce8..12736acea2b 100644 --- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedCharGenerator.java +++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedCharGenerator.java @@ -9,9 +9,9 @@ import io.deephaven.engine.rowset.RowSet; import io.deephaven.engine.rowset.RowSetFactory; import io.deephaven.engine.rowset.WritableRowSet; -import io.deephaven.util.mutable.MutableInt; -import io.deephaven.util.mutable.MutableLong; import it.unimi.dsi.fastutil.longs.Long2CharOpenHashMap; +import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.commons.lang3.mutable.MutableLong; import java.util.Arrays; import java.util.Random; @@ -169,9 +169,9 @@ private void checkSorted() { currentRowSet.forAllRowKeys(idx -> { final char value = currentValues.get(idx); // region check sorted assertion - Assert.leq(lastValue.get(), "lastValue", value, "value"); + Assert.leq(lastValue.longValue(), "lastValue", value, "value"); // endregion check sorted assertion - lastValue.set(value); + lastValue.setValue(value); }); } } diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedDoubleGenerator.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedDoubleGenerator.java index 8ed9730865b..518b61b6a72 100644 --- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedDoubleGenerator.java +++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedDoubleGenerator.java @@ -15,9 +15,9 @@ import io.deephaven.engine.rowset.RowSet; import io.deephaven.engine.rowset.RowSetFactory; import io.deephaven.engine.rowset.WritableRowSet; -import io.deephaven.util.mutable.MutableInt; -import io.deephaven.util.mutable.MutableLong; import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap; +import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.commons.lang3.mutable.MutableLong; import java.util.Arrays; import java.util.Random; diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedIntGenerator.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedIntGenerator.java index 92291607982..11c221870ea 100644 --- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedIntGenerator.java +++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedIntGenerator.java @@ -13,9 +13,9 @@ import io.deephaven.engine.rowset.RowSet; import io.deephaven.engine.rowset.RowSetFactory; import io.deephaven.engine.rowset.WritableRowSet; -import io.deephaven.util.mutable.MutableInt; -import io.deephaven.util.mutable.MutableLong; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; +import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.commons.lang3.mutable.MutableLong; import java.util.Arrays; import java.util.Random; @@ -173,9 +173,9 @@ private void checkSorted() { currentRowSet.forAllRowKeys(idx -> { final int value = currentValues.get(idx); // region check sorted assertion - Assert.leq(lastValue.get(), "lastValue", value, "value"); + Assert.leq(lastValue.longValue(), "lastValue", value, "value"); // endregion check sorted assertion - lastValue.set(value); + lastValue.setValue(value); }); } } diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedLongGenerator.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedLongGenerator.java index 112b47dab95..e3546a7bfd9 100644 --- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedLongGenerator.java +++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/SortedLongGenerator.java @@ -13,9 +13,9 @@ import io.deephaven.engine.rowset.RowSet; import io.deephaven.engine.rowset.RowSetFactory; import io.deephaven.engine.rowset.WritableRowSet; -import io.deephaven.util.mutable.MutableInt; -import io.deephaven.util.mutable.MutableLong; import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap; +import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.commons.lang3.mutable.MutableLong; import java.util.Arrays; import java.util.Random; @@ -173,9 +173,9 @@ private void checkSorted() { currentRowSet.forAllRowKeys(idx -> { final long value = currentValues.get(idx); // region check sorted assertion - Assert.leq(lastValue.get(), "lastValue", value, "value"); + Assert.leq(lastValue.longValue(), "lastValue", value, "value"); // endregion check sorted assertion - lastValue.set(value); + lastValue.setValue(value); }); } }