(juneau) branch master updated: Test modernization

[jamesbognar]

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 623c8853a Test modernization
623c8853a is described below

commit 623c8853a0b0e35dc8ffa536101d75670328248f
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Tue Aug 26 10:40:40 2025 -0400

    Test modernization
---
 .../src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git 
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
 
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
index 14773c544..9f4ddea01 100644
--- 
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
+++ 
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AnyAssertion_Test.java
@@ -101,11 +101,7 @@ class AnyAssertion_Test extends SimpleTestBase {
        @Test void ba03_asJsonSorted() {
                var x1 = a(2,1);
                var nil = (Integer[])null;
-<<<<<<< HEAD
                var x2 = new A1();
-=======
-               Object x2 = new A1();
->>>>>>> branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git
                test(x1).asJsonSorted().is("[1,2]");
                test(x2).asJsonSorted().is("{a:1,b:2}");
                test(nil).asJsonSorted().is("null");