You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by mg...@apache.org on 2022/01/11 09:09:57 UTC
[avro] branch branch-1.11 updated: Replace deprecated JUnit 4.x Assert.assertThat with Hamcrest
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/branch-1.11 by this push:
new bfee632 Replace deprecated JUnit 4.x Assert.assertThat with Hamcrest
bfee632 is described below
commit bfee6323f2a4118e70943cec0e2805cafed6c09b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Tue Jan 11 11:03:45 2022 +0200
Replace deprecated JUnit 4.x Assert.assertThat with Hamcrest
Affects only test code! No JIRA issue!
This change improves the build with JDK 11+
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
(cherry picked from commit e3b11ad1aaedae21c66a7f42509b83302369fbc6)
---
lang/java/avro/src/test/java/org/apache/avro/TestNestedRecords.java | 2 +-
.../src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java | 2 +-
lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java | 2 +-
.../mapred/src/test/java/org/apache/avro/mapreduce/TestFsInput.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestNestedRecords.java b/lang/java/avro/src/test/java/org/apache/avro/TestNestedRecords.java
index 0e9d08e..95cf9a0 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestNestedRecords.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestNestedRecords.java
@@ -29,7 +29,7 @@ import java.io.IOException;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* This test demonstrates the fix for a complex nested schema type.
diff --git a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
index 4da31ea..7597b3f 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
@@ -19,7 +19,7 @@
package org.apache.avro.generic;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.File;
import java.io.IOException;
diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java b/lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java
index f3a0760..7e893ab 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/io/TestEncoders.java
@@ -47,7 +47,7 @@ import java.nio.file.StandardOpenOption;
import static java.util.Arrays.asList;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class TestEncoders {
private static final int ENCODER_BUFFER_SIZE = 32;
diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestFsInput.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestFsInput.java
index fe9233e..4047961 100644
--- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestFsInput.java
+++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestFsInput.java
@@ -20,7 +20,7 @@ package org.apache.avro.mapreduce;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.File;
import java.io.FileOutputStream;