This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
commit 25df5a0f7e444c56d9fe86fdb2f15610467e5c99 Author: Andreas Veithen-Knowles <[email protected]> AuthorDate: Sun Mar 8 10:29:51 2026 +0000 Migrate components/blob from Truth to AssertJ --- .../src/test/java/org/apache/axiom/blob/suite/TestAvailable.java | 2 +- .../src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java | 2 +- .../java/org/apache/axiom/blob/suite/TestRandomReadWrite.java | 8 +++----- .../src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java | 2 +- .../src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java | 2 +- .../java/org/apache/axiom/blob/suite/TestReadFromSupport.java | 2 +- .../test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java | 2 +- .../java/org/apache/axiom/blob/suite/TestResetWithoutMark.java | 2 +- .../blob/src/test/java/org/apache/axiom/blob/suite/TestSkip.java | 4 ++-- .../src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java | 2 +- .../apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java | 2 +- 11 files changed, 14 insertions(+), 16 deletions(-) diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestAvailable.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestAvailable.java index f4613527a..58977a7ad 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestAvailable.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestAvailable.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.InputStream; diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java index 9c9caa22f..a68a34117 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.InputStream; import java.io.OutputStream; diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestRandomReadWrite.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestRandomReadWrite.java index d668e92cf..292227858 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestRandomReadWrite.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestRandomReadWrite.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.InputStream; import java.io.OutputStream; @@ -27,8 +27,6 @@ import java.util.Random; import org.apache.axiom.blob.WritableBlob; import org.apache.axiom.blob.WritableBlobFactory; -import com.google.common.collect.Range; - public class TestRandomReadWrite extends SizeSensitiveWritableBlobTestCase { public TestRandomReadWrite(WritableBlobFactory<?> factory, int size) { super(factory, State.NEW, size); @@ -64,7 +62,7 @@ public class TestRandomReadWrite extends SizeSensitiveWritableBlobTestCase { if (b == -1) { break; } - assertThat(b).isIn(Range.closedOpen(0, 256)); + assertThat(b).isBetween(0, 255); data2[offset++] = (byte) b; } else { int bufferOffset = random.nextInt(512); @@ -74,7 +72,7 @@ public class TestRandomReadWrite extends SizeSensitiveWritableBlobTestCase { break; } int newOffset = offset + read; - assertThat(newOffset).isAtMost(data2.length); + assertThat(newOffset).isLessThanOrEqualTo(data2.length); System.arraycopy(buffer, bufferOffset, data2, offset, read); offset = newOffset; } diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java index 5a79fde92..1a28ddc34 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.InputStream; diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java index 17e1fc691..5d6e4c766 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadFromSupport.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadFromSupport.java index 9ad88c988..104fd1dc5 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadFromSupport.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadFromSupport.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java index 2ff229b46..4c296511a 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.InputStream; diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java index 2c403bcf7..b6261a267 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestResetWithoutMark.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.InputStream; import java.io.OutputStream; diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestSkip.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestSkip.java index 2724a6227..2fa2fd621 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestSkip.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestSkip.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.InputStream; import java.io.OutputStream; @@ -43,7 +43,7 @@ public class TestSkip extends WritableBlobTestCase { assertThat(IOUtils.toByteArray(in, 3)).isEqualTo(new byte[] {9, 7, 5}); // The skip method in FileInputStream returns 10 instead of 2 // (see http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6294974). - assertThat(in.skip(10)).isAnyOf(2L, 10L); + assertThat(in.skip(10)).isIn(2L, 10L); assertThat(in.read()).isEqualTo(-1); } finally { in.close(); diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java index 042033b92..52f6dee0b 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.ByteArrayOutputStream; import java.io.OutputStream; diff --git a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java index c8d547a48..022bca77f 100644 --- a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java +++ b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java @@ -18,7 +18,7 @@ */ package org.apache.axiom.blob.suite; -import static com.google.common.truth.Truth.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.OutputStream; import java.util.Random;
