[shiro] branch 1.6.x updated: (no-issue) fix importing junit5 packages

[bmarwell]

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

bmarwell pushed a commit to branch 1.6.x
in repository https://gitbox.apache.org/repos/asf/shiro.git


The following commit(s) were added to refs/heads/1.6.x by this push:
     new 52946eb  (no-issue) fix importing junit5 packages
     new d7d36a6  Merge pull request #253 from bmhm/1.6.x_junit4fix
52946eb is described below

commit 52946ebf4eedbbe80891a69ad515c5991dd6698b
Author: Benjamin Marwell <bmarw...@gmail.com>
AuthorDate: Thu Aug 20 20:59:24 2020 +0200

    (no-issue) fix importing junit5 packages
    
      - cherry-picking for 1.6.x from master still had the junit5 imports
---
 .../java/org/apache/shiro/lang/util/ClassUtilsTest.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lang/src/test/java/org/apache/shiro/lang/util/ClassUtilsTest.java 
b/lang/src/test/java/org/apache/shiro/lang/util/ClassUtilsTest.java
index 497e58e..2684726 100644
--- a/lang/src/test/java/org/apache/shiro/lang/util/ClassUtilsTest.java
+++ b/lang/src/test/java/org/apache/shiro/lang/util/ClassUtilsTest.java
@@ -18,15 +18,17 @@
  */
 package org.apache.shiro.lang.util;
 
-import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.shiro.util.ClassUtils;
+import org.apache.shiro.util.UnknownClassException;
+import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 
-class ClassUtilsTest {
+public class ClassUtilsTest {
 
     @Test
-    void testGetPrimitiveClasses() throws UnknownClassException {
+    public void testGetPrimitiveClasses() throws UnknownClassException {
 
         assertEquals(ClassUtils.forName("boolean"), boolean.class);
         assertEquals(ClassUtils.forName("byte"), byte.class);
@@ -51,7 +53,7 @@ class ClassUtilsTest {
     }
 
     @Test
-    void testGetPrimitiveArrays() throws UnknownClassException {
+    public void testGetPrimitiveArrays() throws UnknownClassException {
 
         assertEquals(ClassUtils.forName("[Z"), boolean[].class);
         assertEquals(ClassUtils.forName("[B"), byte[].class);
@@ -74,7 +76,7 @@ class ClassUtilsTest {
     }
 
     @Test
-    void testGetClass() {
+    public void testGetClass() {
         assertEquals(ClassUtils.forName("java.lang.String"), String.class);
         assertEquals(ClassUtils.forName("[Ljava.lang.String;"), 
String[].class);
         assertEquals(ClassUtils.forName(String.class.getName()), String.class);