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 2e704ea11 Test modernization
2e704ea11 is described below
commit 2e704ea11a00b0744f9b797d90554c6e7916f36e
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Fri Sep 12 11:40:54 2025 -0400
Test modernization
---
juneau-utest/src/test/java/org/apache/juneau/TestUtils.java | 2 +-
.../java/org/apache/juneau/junit/{ => bct}/AssertionArgs.java | 4 ++--
.../org/apache/juneau/junit/{ => bct}/AssertionArgs_Test.java | 4 ++--
.../org/apache/juneau/junit/{ => bct}/BasicBeanConverter.java | 4 ++--
.../apache/juneau/junit/{ => bct}/BasicBeanConverter_Test.java | 8 ++++----
.../java/org/apache/juneau/junit/{ => bct}/BctAssertions.java | 4 ++--
.../org/apache/juneau/junit/{ => bct}/BctAssertions_Test.java | 4 ++--
.../java/org/apache/juneau/junit/{ => bct}/BeanConverter.java | 2 +-
.../org/apache/juneau/junit/{ => bct}/BeanConverter_Test.java | 4 ++--
.../test/java/org/apache/juneau/junit/{ => bct}/Listifier.java | 2 +-
.../java/org/apache/juneau/junit/{ => bct}/Listifier_Test.java | 2 +-
.../test/java/org/apache/juneau/junit/{ => bct}/Listifiers.java | 2 +-
.../java/org/apache/juneau/junit/{ => bct}/Listifiers_Test.java | 4 ++--
.../java/org/apache/juneau/junit/{ => bct}/NestedTokenizer.java | 6 +++---
.../org/apache/juneau/junit/{ => bct}/NestedTokenizer_Test.java | 6 +++---
.../java/org/apache/juneau/junit/{ => bct}/PropertyExtractor.java | 2 +-
.../org/apache/juneau/junit/{ => bct}/PropertyExtractor_Test.java | 2 +-
.../org/apache/juneau/junit/{ => bct}/PropertyExtractors.java | 4 ++--
.../apache/juneau/junit/{ => bct}/PropertyExtractors_Test.java | 4 ++--
.../apache/juneau/junit/{ => bct}/PropertyNotFoundException.java | 4 ++--
.../juneau/junit/{ => bct}/PropertyNotFoundException_Test.java | 2 +-
.../test/java/org/apache/juneau/junit/{ => bct}/Stringifier.java | 2 +-
.../java/org/apache/juneau/junit/{ => bct}/Stringifier_Test.java | 2 +-
.../test/java/org/apache/juneau/junit/{ => bct}/Stringifiers.java | 4 ++--
.../java/org/apache/juneau/junit/{ => bct}/Stringifiers_Test.java | 4 ++--
.../src/test/java/org/apache/juneau/junit/{ => bct}/Swapper.java | 2 +-
.../test/java/org/apache/juneau/junit/{ => bct}/Swapper_Test.java | 2 +-
.../src/test/java/org/apache/juneau/junit/{ => bct}/Swappers.java | 2 +-
.../java/org/apache/juneau/junit/{ => bct}/Swappers_Test.java | 4 ++--
.../src/test/java/org/apache/juneau/junit/{ => bct}/TestBase.java | 2 +-
.../java/org/apache/juneau/junit/{ => bct}/ThrowingSupplier.java | 2 +-
.../org/apache/juneau/junit/{ => bct}/ThrowingSupplier_Test.java | 2 +-
.../src/test/java/org/apache/juneau/junit/{ => bct}/Utils.java | 2 +-
.../test/java/org/apache/juneau/junit/{ => bct}/Utils_Test.java | 6 +++---
34 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
index c9f00409e..a5a0e0c44 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
@@ -27,7 +27,7 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.bean.swagger.*;
import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.junit.*;
+import org.apache.juneau.junit.bct.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/AssertionArgs.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/AssertionArgs.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs.java
index ef64c327c..911cec8fb 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/AssertionArgs.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static java.util.Optional.*;
-import static org.apache.juneau.junit.Utils.*;
+import static org.apache.juneau.junit.bct.Utils.*;
import java.text.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/AssertionArgs_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/AssertionArgs_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs_Test.java
index 1a553efb6..527f54229 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/AssertionArgs_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/AssertionArgs_Test.java
@@ -10,9 +10,9 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.BctAssertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.text.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/BasicBeanConverter.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/BasicBeanConverter.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter.java
index f233b713a..a1e28f1c7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/BasicBeanConverter.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter.java
@@ -10,11 +10,11 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static java.util.Optional.*;
-import static org.apache.juneau.junit.Utils.*;
import static java.util.stream.Collectors.*;
+import static org.apache.juneau.junit.bct.Utils.*;
import java.io.*;
import java.lang.reflect.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/BasicBeanConverter_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/BasicBeanConverter_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
index 407f185ca..d227711b9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/BasicBeanConverter_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BasicBeanConverter_Test.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.BctAssertions.*;
-import static org.apache.juneau.junit.BasicBeanConverter.*;
+import static org.apache.juneau.junit.bct.BasicBeanConverter.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.time.*;
@@ -380,7 +380,7 @@ class BasicBeanConverter_Test extends TestBase {
var bean = new TestBean("John", 30);
var result = converter.stringify(bean);
-
assertTrue(result.contains("org.apache.juneau.junit.BasicBeanConverter_Test$TestBean"));
+ assertContains(getClass().getDeclaringClass().getName()
+ "$TestBean", result);
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/BctAssertions.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BctAssertions.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/BctAssertions.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/BctAssertions.java
index 7cc86498f..365397576 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/BctAssertions.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BctAssertions.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static java.util.stream.Collectors.*;
-import static org.apache.juneau.junit.Utils.*;
+import static org.apache.juneau.junit.bct.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/BctAssertions_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BctAssertions_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/BctAssertions_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/BctAssertions_Test.java
index 463116b87..b4bc6917e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/BctAssertions_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BctAssertions_Test.java
@@ -10,9 +10,9 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.BctAssertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/BeanConverter.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/BeanConverter.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter.java
index 36a3d935a..453aaf2c6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/BeanConverter.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/BeanConverter_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/BeanConverter_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter_Test.java
index 397b8c820..0c2dc82fe 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/BeanConverter_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/BeanConverter_Test.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
+import static org.apache.juneau.junit.bct.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
-import static org.apache.juneau.junit.Utils.*;
import java.util.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit/Listifier.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/Listifier.java
rename to juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier.java
index cf2c347df..c827cca9a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Listifier.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import java.util.*;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/Listifier_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/Listifier_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier_Test.java
index 6400c0b82..275ecc865 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Listifier_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifier_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit/Listifiers.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifiers.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/Listifiers.java
rename to juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifiers.java
index fb8199c9f..58fb03a43 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Listifiers.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifiers.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static java.util.Collections.*;
import static java.util.stream.StreamSupport.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/Listifiers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifiers_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/Listifiers_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifiers_Test.java
index 9e280d632..c0e5eaccb 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Listifiers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Listifiers_Test.java
@@ -10,9 +10,9 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.BctAssertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/NestedTokenizer.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/NestedTokenizer.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer.java
index f229359f7..0ca546eb5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/NestedTokenizer.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer.java
@@ -10,12 +10,12 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static java.util.Collections.*;
import static java.util.stream.Collectors.*;
-import static org.apache.juneau.junit.Utils.*;
-import static org.apache.juneau.junit.NestedTokenizer.ParseState.*;
+import static org.apache.juneau.junit.bct.NestedTokenizer.ParseState.*;
+import static org.apache.juneau.junit.bct.Utils.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/NestedTokenizer_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/NestedTokenizer_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer_Test.java
index a74c20de0..93ad486a5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/NestedTokenizer_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/NestedTokenizer_Test.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.BctAssertions.*;
-import static org.apache.juneau.junit.NestedTokenizer.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
+import static org.apache.juneau.junit.bct.NestedTokenizer.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractor.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractor.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor.java
index 6f8d55afe..9720c393f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractor.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
/**
* Interface for custom property extraction strategies in the Bean-Centric
Testing framework.
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractor_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractor_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor_Test.java
index bf60a6cde..72199d2bb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractor_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractor_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractors.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractors.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors.java
index d866cfc9f..edb6c2fd4 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractors.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static java.lang.Integer.*;
-import static org.apache.juneau.junit.Utils.*;
+import static org.apache.juneau.junit.bct.Utils.*;
import java.lang.reflect.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractors_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractors_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors_Test.java
index db4134205..e60978e55 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyExtractors_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyExtractors_Test.java
@@ -10,9 +10,9 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.BctAssertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyNotFoundException.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyNotFoundException.java
similarity index 97%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/PropertyNotFoundException.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyNotFoundException.java
index fae896b0e..96ef7bc81 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyNotFoundException.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyNotFoundException.java
@@ -10,9 +10,9 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.Utils.*;
+import static org.apache.juneau.junit.bct.Utils.*;
/**
* Exception thrown when a requested property cannot be found on an object.
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyNotFoundException_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyNotFoundException_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/PropertyNotFoundException_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyNotFoundException_Test.java
index 6c6e1c59a..952d67389 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/PropertyNotFoundException_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/PropertyNotFoundException_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/Stringifier.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/Stringifier.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier.java
index f99fe9f3c..9bf5ebb98 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Stringifier.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/Stringifier_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/Stringifier_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier_Test.java
index 30858b7c5..5783f9098 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Stringifier_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifier_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/Stringifiers.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/Stringifiers.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers.java
index 97172188f..85e98580d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Stringifiers.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers.java
@@ -10,11 +10,11 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static java.time.format.DateTimeFormatter.*;
import static java.util.stream.Collectors.*;
-import static org.apache.juneau.junit.Utils.*;
+import static org.apache.juneau.junit.bct.Utils.*;
import java.io.*;
import java.lang.reflect.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/Stringifiers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/Stringifiers_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers_Test.java
index 216d4f2d9..0e5de4b89 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Stringifiers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers_Test.java
@@ -10,9 +10,9 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.BctAssertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.io.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit/Swapper.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/Swapper.java
rename to juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper.java
index aee9368f6..e12fcc4ae 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Swapper.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import java.util.function.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/Swapper_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper_Test.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/Swapper_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper_Test.java
index 40c4b7a8c..570d976d8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Swapper_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swapper_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit/Swappers.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swappers.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/Swappers.java
rename to juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swappers.java
index e1971bbe7..2f461a0bc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Swappers.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swappers.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import java.util.*;
import java.util.concurrent.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/Swappers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swappers_Test.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/Swappers_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swappers_Test.java
index d6e3d49b5..0b4a9e432 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Swappers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Swappers_Test.java
@@ -10,9 +10,9 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.BctAssertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit/TestBase.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/TestBase.java
similarity index 98%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/TestBase.java
rename to juneau-utest/src/test/java/org/apache/juneau/junit/bct/TestBase.java
index e59fbd259..3c1925a30 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/TestBase.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/TestBase.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/ThrowingSupplier.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/ThrowingSupplier.java
similarity index 97%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/ThrowingSupplier.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/ThrowingSupplier.java
index 28f1e86dc..76c627435 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/ThrowingSupplier.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/ThrowingSupplier.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
/**
* A supplier that throws an exception.
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/ThrowingSupplier_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/ThrowingSupplier_Test.java
similarity index 99%
rename from
juneau-utest/src/test/java/org/apache/juneau/junit/ThrowingSupplier_Test.java
rename to
juneau-utest/src/test/java/org/apache/juneau/junit/bct/ThrowingSupplier_Test.java
index a68e963f6..2f35ff9d2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/ThrowingSupplier_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/ThrowingSupplier_Test.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit/Utils.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Utils.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/Utils.java
rename to juneau-utest/src/test/java/org/apache/juneau/junit/bct/Utils.java
index 3ac123bc2..57e5c48f8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Utils.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Utils.java
@@ -10,7 +10,7 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
import static java.util.Optional.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/junit/Utils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Utils_Test.java
similarity index 99%
rename from juneau-utest/src/test/java/org/apache/juneau/junit/Utils_Test.java
rename to juneau-utest/src/test/java/org/apache/juneau/junit/bct/Utils_Test.java
index b48328b86..5b246c856 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/junit/Utils_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Utils_Test.java
@@ -10,10 +10,10 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.junit;
+package org.apache.juneau.junit.bct;
-import static org.apache.juneau.junit.Utils.*;
-import static org.apache.juneau.junit.BctAssertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
+import static org.apache.juneau.junit.bct.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
