sonar

leaderli · Nov 21, 2024 · ca916ff · ca916ff
1 parent 1ef9373
commit ca916ff
Show file tree

Hide file tree

Showing 15 changed files with 157 additions and 20 deletions.
diff --git a/litool-core/src/main/java/io/leaderli/litool/core/meta/Lino.java b/litool-core/src/main/java/io/leaderli/litool/core/meta/Lino.java
@@ -93,7 +93,7 @@ static <T> Lino<T> ofIgnoreError(ThrowableSupplier<? extends T> supplier) {
             return new Some<>(value);
         } catch (Throwable e) {
             WhenThrowBehavior.whenThrow(ExceptionUtil.unwrapThrowable(e));
-            return none();
+            return new Error<>(e);
         }
     }
 
@@ -152,6 +152,19 @@ static <T> Lino<T> narrow(Lino<? extends T> value) {
 
     }
 
+
+    /**
+     * @return 判断是否有异常
+     * @see Error
+     */
+    boolean hasError();
+
+    /**
+     * @return 返回是否有异常
+     * @see Error
+     */
+    Throwable getError();
+
     /**
      * 这是一个泛型接口Lino，该方法为其默认方法，作用是将传入的参数filter应用于泛型T，如果满足断言条件，则返回当前对象，否则抛出IllegalStateException异常。
      *
@@ -549,6 +562,16 @@ public String toString() {
             return name() + "(" + value + ")";
         }
 
+        @Override
+        public boolean hasError() {
+            return false;
+        }
+
+        @Override
+        public Throwable getError() {
+            return null;
+        }
+
         @Override
         public Lino<T> assertTrue(Function<? super T, ?> filter, String msg) {
             if (filter(filter).absent()) {
@@ -737,10 +760,10 @@ public <R> Lino<R> mapIgnoreError(ThrowableFunction<? super T, ? extends R> mapp
                 return of(mapper.apply(this.value));
             } catch (Throwable throwable) {
                 if (whenThrow != null) {
-                    whenThrow.accept(throwable);
+                    whenThrow.accept(ExceptionUtil.unwrapThrowable(throwable));
                 }
+                return new Error<>(throwable);
             }
-            return none();
         }
 
         @Override
@@ -766,7 +789,7 @@ public <R> Lira<R> toLira(LiTypeToken<? extends R> type) {
     /**
      * @param <T> 值的类型
      */
-    final class None<T> implements Lino<T> {
+    class None<T> implements Lino<T> {
         private static final None<?> INSTANCE = new None<>();
 
         private None() {
@@ -788,6 +811,16 @@ public String toString() {
             return name() + "()";
         }
 
+        @Override
+        public boolean hasError() {
+            return false;
+        }
+
+        @Override
+        public Throwable getError() {
+            return null;
+        }
+
         @Override
         public Lino<T> assertTrue(Function<? super T, ?> filter, String msg) {
             throw new IllegalStateException(msg);
@@ -972,4 +1005,28 @@ public <R> Lira<R> toLira(LiTypeToken<? extends R> type) {
             return Lira.none();
         }
     }
+
+    final class Error<T> extends None<T> {
+
+        public final Throwable throwable;
+
+        public Error(Throwable throwable) {
+            this.throwable = throwable;
+        }
+
+        @Override
+        public String name() {
+            return "Error";
+        }
+
+        @Override
+        public boolean hasError() {
+            return true;
+        }
+
+        @Override
+        public Throwable getError() {
+            return throwable;
+        }
+    }
 }
diff --git a/...o/leaderli/litool/core/bean/EnumTest.java → ...aderli/litool/core/bean/EnumTestBean.java b/...o/leaderli/litool/core/bean/EnumTest.java → ...aderli/litool/core/bean/EnumTestBean.java
@@ -1,6 +1,6 @@
 package io.leaderli.litool.core.bean;
 
-public class EnumTest {
+public class EnumTestBean {
 
     enum State {
         A

diff --git a/litool-core/src/test/java/io/leaderli/litool/core/bean/Person.java b/litool-core/src/test/java/io/leaderli/litool/core/bean/Person.java
@@ -0,0 +1,24 @@
+package io.leaderli.litool.core.bean;
+
+public class Person {
+
+    private String name;
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    private int age;
+}
diff --git a/litool-core/src/test/java/io/leaderli/litool/core/bit/BitStrEnumTest.java b/litool-core/src/test/java/io/leaderli/litool/core/bit/BitStrEnumTest.java
@@ -15,7 +15,7 @@
  * @author leaderli
  * @since 2022/7/21
  */
-class BitPositionEnumTest {
+class BitPositionEnumTestBean {
 
 
     @Test

diff --git a/litool-core/src/test/java/io/leaderli/litool/core/io/FileUtilTest.java b/litool-core/src/test/java/io/leaderli/litool/core/io/FileUtilTest.java
@@ -1,8 +1,18 @@
 package io.leaderli.litool.core.io;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 class FileUtilTest {
 
 
+    @Test
+    void test() {
+
+        Assertions.assertNotNull(FileUtil.getHome());
+        Assertions.assertTrue(FileUtil.getHomeFile().isDirectory());
+
+    }
 
 
 

diff --git a/litool-core/src/test/java/io/leaderli/litool/core/io/TailerTest.java b/litool-core/src/test/java/io/leaderli/litool/core/io/TailerTest.java
@@ -1,13 +1,13 @@
 package io.leaderli.litool.core.io;
 
 import io.leaderli.litool.core.util.RandomUtil;
-import io.leaderli.litool.core.util.ThreadUtil;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
 class TailerTest {
 
-//    @Test
+    @Test
     void test() {
 
         Tailer tailer = new Tailer(new File("123.txt"), new TailerListener() {
@@ -25,8 +25,8 @@ public void delay(Tailer tailer) {
                 }
             }
         });
-        ThreadUtil.start(tailer, false);
+//        ThreadUtil.start(tailer, false);
 
     }
 
-}
+}
diff --git a/litool-core/src/test/java/io/leaderli/litool/core/lang/ShellTest.java b/litool-core/src/test/java/io/leaderli/litool/core/lang/ShellTest.java
@@ -1,5 +1,6 @@
 package io.leaderli.litool.core.lang;
 
+import io.leaderli.litool.core.env.OSInfo;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -17,7 +18,9 @@ class ShellTest {
 
     @Test
     void bash() throws ExecutionException, InterruptedException, TimeoutException {
-
+        if (OSInfo.isWindows()) {
+            return;
+        }
         Future<String> command = new Shell().bash("123");
         Assertions.assertTrue(command.get().contains("not found"));
         Assertions.assertTrue(command.get().contains("not found"));

diff --git a/...e/src/test/java/io/leaderli/litool/core/lang/lean/adapters/MapTypeAdapterFactoryTest.java b/...e/src/test/java/io/leaderli/litool/core/lang/lean/adapters/MapTypeAdapterFactoryTest.java
@@ -1,5 +1,28 @@
 package io.leaderli.litool.core.lang.lean.adapters;
 
+import io.leaderli.litool.core.bean.Person;
+import io.leaderli.litool.core.lang.lean.Lean;
+import io.leaderli.litool.core.lang.lean.TypeAdapter;
+import io.leaderli.litool.core.type.LiTypeToken;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
 class MapTypeAdapterFactoryTest {
 
+    @Test
+    void test() {
+        Lean lean = new Lean();
+
+        MapTypeAdapterFactory mapTypeAdapterFactory = new MapTypeAdapterFactory();
+        TypeAdapter<Map<String, String>> mapTypeAdapter = mapTypeAdapterFactory.create(lean, new LiTypeToken<Map<String, String>>() {
+        });
+
+        Person person = new Person();
+        person.setName("tom");
+        Map<String, String> read = mapTypeAdapter.read(person, lean);
+        Assertions.assertEquals("tom", read.get("name"));
+        Assertions.assertEquals("0", read.get("age"));
+    }
 }
diff --git a/litool-core/src/test/java/io/leaderli/litool/core/meta/LinoTest.java b/litool-core/src/test/java/io/leaderli/litool/core/meta/LinoTest.java
@@ -277,8 +277,15 @@ void map() {
 
     @Test
     void throwable_map() {
+        WhenThrowBehavior.setIgnore();
+        Assertions.assertFalse(Lino.none().hasError());
+        Assertions.assertFalse(Lino.of(1).hasError());
+        //noinspection divzero,NumericOverflow
+        Assertions.assertTrue(Lino.ofIgnoreError(() -> 1 / 0).hasError());
         LiBox<Integer> box = LiBox.none();
-        Assertions.assertSame(Lino.of(0).mapIgnoreError(i -> 5 / i, null), Lino.none());
+        Lino<Integer> lino = Lino.of(0).mapIgnoreError(i -> 5 / i, null);
+        Assertions.assertTrue(lino.hasError());
+        Assertions.assertInstanceOf(ArithmeticException.class, lino.getError());
         Assertions.assertNull(box.value());
         Lino.of(0).mapIgnoreError(i -> 5 / i, t -> box.value(2));
         Assertions.assertSame(2, box.value());
@@ -287,10 +294,12 @@ void throwable_map() {
         StringWriter out = new StringWriter();
         System.setErr(new PrintStream(out));
         WhenThrowBehavior.setPrintStackTrace();
-        Assertions.assertSame(Lino.of(0).mapIgnoreError(i -> 5 / i), Lino.none());
+        lino = Lino.of(0).mapIgnoreError(i -> 5 / i);
+        Assertions.assertInstanceOf(ArithmeticException.class, lino.getError());
         Assertions.assertTrue(out.get().startsWith("java.lang.ArithmeticException: / by zero"));
     }
 
+
     @Test
     void toLira() {
 

diff --git a/litool-core/src/test/java/io/leaderli/litool/core/type/ClassScannerTest.java b/litool-core/src/test/java/io/leaderli/litool/core/type/ClassScannerTest.java
@@ -51,7 +51,7 @@ void getSubTypesOf() {
         Lira<Class<Lino>> subTypesOf =
                 ClassScanner.getSubTypesOf(Lino.class.getPackage().getName(),
                         Lino.class);
-        Assertions.assertEquals(2, subTypesOf.size());
+        Assertions.assertEquals(3, subTypesOf.size());
     }
 
 

diff --git a/...i/litool/core/type/PrimitiveEnumTest.java → ...tool/core/type/PrimitiveEnumTestBean.java b/...i/litool/core/type/PrimitiveEnumTest.java → ...tool/core/type/PrimitiveEnumTestBean.java
@@ -13,7 +13,7 @@
  * @author leaderli
  * @since 2022/8/17 7:11 PM
  */
-class PrimitiveEnumTest {
+class PrimitiveEnumTestBean {
     @Test
     void checkNotPrimitive() {
 

diff --git a/litool-core/src/test/java/io/leaderli/litool/core/type/ReflectUtilTest.java b/litool-core/src/test/java/io/leaderli/litool/core/type/ReflectUtilTest.java
@@ -1,6 +1,6 @@
 package io.leaderli.litool.core.type;
 
-import io.leaderli.litool.core.bean.EnumTest;
+import io.leaderli.litool.core.bean.EnumTestBean;
 import io.leaderli.litool.core.io.StringWriter;
 import io.leaderli.litool.core.lang.DisposableRunnableProxy;
 import io.leaderli.litool.core.meta.Lino;
@@ -241,7 +241,7 @@ void newInstance() throws NoSuchMethodException, InstantiationException, Illegal
 
         // enum
 
-        Class<?> declaredClass = EnumTest.class.getDeclaredClasses()[0];
+        Class<?> declaredClass = EnumTestBean.class.getDeclaredClasses()[0];
         Assertions.assertEquals("A", ReflectUtil.newInstance(declaredClass).get().toString());
     }
 

diff --git a/litool-core/src/test/java/io/leaderli/litool/core/util/NetUtilTest.java b/litool-core/src/test/java/io/leaderli/litool/core/util/NetUtilTest.java
@@ -1,17 +1,22 @@
 package io.leaderli.litool.core.util;
 
+import io.leaderli.litool.core.env.OSInfo;
 import io.leaderli.litool.core.meta.WhenThrowBehavior;
 import io.leaderli.litool.core.resource.net.NetUtil;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author leaderli
  * @since 2022/6/27
  */
 class NetUtilTest {
 
-    //    @Test
+    @Test
     void pingable() {
+        if (OSInfo.isWindows()) {
+            return;
+        }
         WhenThrowBehavior.setIgnore();
         Assertions.assertTrue(NetUtil.pingable("127.0.0.1"));
         Assertions.assertFalse(NetUtil.pingable("182.180.333.444"));

diff --git a/...ool/runner/constant/OperatorEnumTest.java → ...runner/constant/OperatorEnumTestBean.java b/...ool/runner/constant/OperatorEnumTest.java → ...runner/constant/OperatorEnumTestBean.java
@@ -8,7 +8,7 @@
  * @author leaderli
  * @since 2022/8/13 9:53 AM
  */
-class OperatorEnumTest {
+class OperatorEnumTestBean {
 
     @Test
     void test() {

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,13 @@
             <version>2.8.9</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.jacoco</groupId>
+            <artifactId>org.jacoco.agent</artifactId>
+            <version>0.8.7</version>
+            <classifier>runtime</classifier>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>