tests: Optional

fixed: CDParameters: for constructors
fixed: IMethod#toString when compiled with -g

assira/src/main/java/net/ranides/assira/collection/lists/ListUtils.java

@@ -48,7 +48,7 @@ public final class ListUtils {
 	
 	public static <T> Optional<T> last(List<T> values) {
 		if(values.isEmpty()) {
-			Optional.empty();
+			return Optional.empty();
 		}
 		return Optional.of(values.get(values.size()-1));
 	}

assira/src/main/java/net/ranides/assira/reflection/impl/AMethod.java

@@ -156,5 +156,9 @@ public abstract class AMethod implements IMethod {
             .open("(", ")",", ").append(arguments().list()).close()
             .toString();
     }
+
+    protected String[] $debugParams() {
+        return CDParameters.getParams(reflective());
+    }
 	
 }

assira/src/main/java/net/ranides/assira/reflection/impl/CDParameters.java

@@ -97,7 +97,7 @@ public class CDParameters {
             if (constructor != null) {
                 String[] names = new String[constructor.getParameterCount()];
                 cParams.put(constructor, names);
-                return new LMVisitor(names, 0);
+                return new LMVisitor(names, 1);
             }
             
             Method method = mMethods.get(name + desc);

assira/src/main/java/net/ranides/assira/reflection/impl/FArgument.java

@@ -40,7 +40,7 @@ public final class FArgument {
         return newArgument(entry.getKey(), entry.getValue());
     }
     
-    public static IArgument newArgument(IContext context, IMethod parent, Parameter param, int index) {
+    public static IArgument newArgument(IContext context, AMethod parent, Parameter param, int index) {
         return new RArgument(context, parent, param, index);
     }
     

assira/src/main/java/net/ranides/assira/reflection/impl/RArgument.java

@@ -21,13 +21,13 @@ public class RArgument implements IArgument {
 
     private final IContext context;
     
-    private final IMethod parent;
+    private final AMethod parent;
     
     private final Parameter param;
     
     private final int index;
 
-    RArgument(IContext context, IMethod parent, Parameter param, int index) {
+    RArgument(IContext context, AMethod parent, Parameter param, int index) {
         this.parent = parent;
         this.param = param;
         this.context = context;
@@ -58,7 +58,7 @@ public class RArgument implements IArgument {
     @Override
     public String name() {
         if(!param.isNamePresent()) {
-            String[] names = CDParameters.getParams(parent.reflective());
+            String[] names = parent.$debugParams();
             if(null == names) {
                 throw new UnsupportedOperationException("You have to compile class with -parameters or -g switch");
             }
@@ -67,6 +67,16 @@ public class RArgument implements IArgument {
         return param.getName();
     }
 
+    private String iname() {
+        if(!param.isNamePresent()) {
+            String[] names = parent.$debugParams();
+            if(null != names) {
+                return names[index];
+            }
+        }
+        return param.getName();
+    }
+
     @Override
     public IMethod parent() {
         return parent;
@@ -99,7 +109,7 @@ public class RArgument implements IArgument {
 
     @Override
     public String toString() {
-        return type() + " " + param.getName();
+        return type() + " " + iname();
     }
     
 }

assira/src/main/java/net/ranides/assira/reflection/impl/RConstructor.java

@@ -15,6 +15,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Supplier;
+
+import net.ranides.assira.collection.arrays.ArrayUtils;
 import net.ranides.assira.collection.lists.ListUtils;
 import net.ranides.assira.generic.LazyReference;
 import net.ranides.assira.trace.ExceptionUtils;
@@ -130,4 +132,8 @@ public final class RConstructor extends AMethod {
         return FElements.newAnnotations(AHints.EMPTY, CQueryBuilder.fromArray(method.getAnnotations()));
 	}
 
+	protected String[] $debugParams() {
+		return CDParameters.getParams(method);
+	}
+
 }

assira/src/test/java/net/ranides/assira/collection/CollectionUtilsTest.java

@@ -28,18 +28,18 @@ public class CollectionUtilsTest {
 		List<String> list1 = Arrays.asList("a");
 		List<String> list0 = Arrays.asList();
 		
-        assertEquals("a", CollectionUtils.first(list8));
-        assertEquals("a", CollectionUtils.first(list1));
+        assertEquals("a", CollectionUtils.first(list8).get());
+        assertEquals("a", CollectionUtils.first(list1).get());
 		
         assertThrows(NoSuchElementException.class, ()-> {
-			CollectionUtils.first(list0);
+			CollectionUtils.first(list0).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			CollectionUtils.first(list8, v -> false);
+			CollectionUtils.first(list8, v -> false).get();
 		});
 		
-		assertEquals("a", CollectionUtils.first(list8, v -> true));
-		assertEquals("cc", CollectionUtils.first(list8, v -> v.length()>1));
+		assertEquals("a", CollectionUtils.first(list8, v -> true).get());
+		assertEquals("cc", CollectionUtils.first(list8, v -> v.length()>1).get());
     }
 	
 	@Test
@@ -48,18 +48,18 @@ public class CollectionUtilsTest {
 		List<String> list1 = Arrays.asList("a");
 		List<String> list0 = Arrays.asList();
 		
-        assertEquals("h", CollectionUtils.last(list8));
-        assertEquals("a", CollectionUtils.last(list1));
+        assertEquals("h", CollectionUtils.last(list8).get());
+        assertEquals("a", CollectionUtils.last(list1).get());
 		
         assertThrows(NoSuchElementException.class, ()-> {
-			CollectionUtils.last(list0);
+			CollectionUtils.last(list0).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			CollectionUtils.last(list8, v -> false);
+			CollectionUtils.last(list8, v -> false).get();
 		});
 		
-		assertEquals("h", CollectionUtils.last(list8, v -> true));
-		assertEquals("gg", CollectionUtils.last(list8, v -> v.length()>1));
+		assertEquals("h", CollectionUtils.last(list8, v -> true).get());
+		assertEquals("gg", CollectionUtils.last(list8, v -> v.length()>1).get());
     }
 	
 	@Test

assira/src/test/java/net/ranides/assira/collection/arrays/ArraySearchTest.java

@@ -155,17 +155,17 @@ public class ArraySearchTest {
 		String[] list8 = new String[]{"a", "b", "cc", "d", "ee", "f", "gg", "h"};
 
 		assertThrows(NoSuchElementException.class, ()-> {
-			ArraySearch.first(list8, v -> false);
+			ArraySearch.first(list8, v -> false).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			ArraySearch.first(list8, 1, 3, v -> false);
+			ArraySearch.first(list8, 1, 3, v -> false).get();
 		});
 		
-		assertEquals("b", ArraySearch.first(list8, 1, 3, v -> true));
+		assertEquals("b", ArraySearch.first(list8, 1, 3, v -> true).get());
 		
-		assertEquals("cc", ArraySearch.first(list8, (String v) -> v.length()>1));
-		assertEquals("cc", ArraySearch.first(list8, 1, 3, (String v) -> v.length()>1));
-		assertEquals("ee", ArraySearch.first(list8, 3, 5, (String v) -> v.length()>1));
+		assertEquals("cc", ArraySearch.first(list8, (String v) -> v.length()>1).get());
+		assertEquals("cc", ArraySearch.first(list8, 1, 3, (String v) -> v.length()>1).get());
+		assertEquals("ee", ArraySearch.first(list8, 3, 5, (String v) -> v.length()>1).get());
     }
 	
 	@Test
@@ -173,17 +173,17 @@ public class ArraySearchTest {
 		String[] list8 = new String[]{"a", "b", "cc", "d", "ee", "f", "gg", "h"};
 
 		assertThrows(NoSuchElementException.class, ()-> {
-			ArraySearch.last(list8, v -> false);
+			ArraySearch.last(list8, v -> false).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			ArraySearch.last(list8, 1, 3, v -> false);
+			ArraySearch.last(list8, 1, 3, v -> false).get();
 		});
 		
-		assertEquals("d", ArraySearch.last(list8, 1, 4, v -> true));
+		assertEquals("d", ArraySearch.last(list8, 1, 4, v -> true).get());
 		
-		assertEquals("gg", ArraySearch.last(list8, (String v) -> v.length()>1));
-		assertEquals("ee", ArraySearch.last(list8, 1, 6, (String v) -> v.length()>1));
-		assertEquals("cc", ArraySearch.last(list8, 1, 3, (String v) -> v.length()>1));
+		assertEquals("gg", ArraySearch.last(list8, (String v) -> v.length()>1).get());
+		assertEquals("ee", ArraySearch.last(list8, 1, 6, (String v) -> v.length()>1).get());
+		assertEquals("cc", ArraySearch.last(list8, 1, 3, (String v) -> v.length()>1).get());
     }
     
     @Test

assira/src/test/java/net/ranides/assira/collection/arrays/NativeArraySearchTest.java

@@ -92,17 +92,17 @@ public class NativeArraySearchTest {
 		NativeArray list8 = NativeArray.wrap(new String[]{"a", "b", "cc", "d", "ee", "f", "gg", "h"});
 
 		assertThrows(NoSuchElementException.class, ()-> {
-			NativeArraySearch.first(list8, v -> false);
+			NativeArraySearch.first(list8, v -> false).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			NativeArraySearch.first(list8, 1, 3, v -> false);
+			NativeArraySearch.first(list8, 1, 3, v -> false).get();
 		});
 		
-		assertEquals("b", NativeArraySearch.first(list8, 1, 3, v -> true));
+		assertEquals("b", NativeArraySearch.first(list8, 1, 3, v -> true).get());
 		
-		assertEquals("cc", NativeArraySearch.first(list8, (String v) -> v.length()>1));
-		assertEquals("cc", NativeArraySearch.first(list8, 1, 3, (String v) -> v.length()>1));
-		assertEquals("ee", NativeArraySearch.first(list8, 3, 5, (String v) -> v.length()>1));
+		assertEquals("cc", NativeArraySearch.first(list8, (String v) -> v.length()>1).get());
+		assertEquals("cc", NativeArraySearch.first(list8, 1, 3, (String v) -> v.length()>1).get());
+		assertEquals("ee", NativeArraySearch.first(list8, 3, 5, (String v) -> v.length()>1).get());
     }
 	
 	@Test
@@ -110,17 +110,17 @@ public class NativeArraySearchTest {
 		NativeArray list8 = NativeArray.wrap(new String[]{"a", "b", "cc", "d", "ee", "f", "gg", "h"});
 
 		assertThrows(NoSuchElementException.class, ()-> {
-			NativeArraySearch.last(list8, v -> false);
+			NativeArraySearch.last(list8, v -> false).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			NativeArraySearch.last(list8, 1, 3, v -> false);
+			NativeArraySearch.last(list8, 1, 3, v -> false).get();
 		});
 		
-		assertEquals("d", NativeArraySearch.last(list8, 1, 4, v -> true));
+		assertEquals("d", NativeArraySearch.last(list8, 1, 4, v -> true).get());
 		
-		assertEquals("gg", NativeArraySearch.last(list8, (String v) -> v.length()>1));
-		assertEquals("ee", NativeArraySearch.last(list8, 1, 6, (String v) -> v.length()>1));
-		assertEquals("cc", NativeArraySearch.last(list8, 1, 3, (String v) -> v.length()>1));
+		assertEquals("gg", NativeArraySearch.last(list8, (String v) -> v.length()>1).get());
+		assertEquals("ee", NativeArraySearch.last(list8, 1, 6, (String v) -> v.length()>1).get());
+		assertEquals("cc", NativeArraySearch.last(list8, 1, 3, (String v) -> v.length()>1).get());
     }
     
     @Test

assira/src/test/java/net/ranides/assira/collection/iterators/IntIteratorUtilsTest.java

@@ -35,7 +35,7 @@ public class IntIteratorUtilsTest {
 		assertEquals(1, IntIteratorUtils.first(IntArrays.asList(1).iterator()));
 		
 		assertThrows(NoSuchElementException.class, () -> {
-			IteratorUtils.first(Arrays.asList().iterator());
+			IntIteratorUtils.first(IntArrays.asList().iterator());
 		});
 	}
 	
@@ -46,7 +46,7 @@ public class IntIteratorUtilsTest {
 		assertEquals(4, IntIteratorUtils.last(IntArrays.asList(4).iterator()));
 		
 		assertThrows(NoSuchElementException.class, () -> {
-			IteratorUtils.last(Arrays.asList().iterator());
+            IntIteratorUtils.last(IntArrays.asList().iterator());
 		});
 	}
     

assira/src/test/java/net/ranides/assira/collection/iterators/IteratorUtilsTest.java

@@ -29,51 +29,51 @@ public class IteratorUtilsTest {
 	
 	@Test
 	public void testFirst() {
-		assertEquals((Integer)1, IteratorUtils.first(Arrays.asList(1,2,3,4).iterator()));
-		assertEquals((Integer)1, IteratorUtils.first(Arrays.asList(1,2).iterator()));
-		assertEquals((Integer)1, IteratorUtils.first(Arrays.asList(1).iterator()));
+		assertEquals((Integer)1, IteratorUtils.first(Arrays.asList(1,2,3,4).iterator()).get());
+		assertEquals((Integer)1, IteratorUtils.first(Arrays.asList(1,2).iterator()).get());
+		assertEquals((Integer)1, IteratorUtils.first(Arrays.asList(1).iterator()).get());
 		
 		assertThrows(NoSuchElementException.class, () -> {
-			IteratorUtils.first(Arrays.asList().iterator());
+			IteratorUtils.first(Arrays.asList().iterator()).get();
 		});
 	}
 	
 	@Test
 	public void testLast() {
-		assertEquals((Integer)4, IteratorUtils.last(Arrays.asList(1,2,3,4).iterator()));
-		assertEquals((Integer)4, IteratorUtils.last(Arrays.asList(3,4).iterator()));
-		assertEquals((Integer)4, IteratorUtils.last(Arrays.asList(4).iterator()));
+		assertEquals((Integer)4, IteratorUtils.last(Arrays.asList(1,2,3,4).iterator()).get());
+		assertEquals((Integer)4, IteratorUtils.last(Arrays.asList(3,4).iterator()).get());
+		assertEquals((Integer)4, IteratorUtils.last(Arrays.asList(4).iterator()).get());
 		
 		assertThrows(NoSuchElementException.class, () -> {
-			IteratorUtils.last(Arrays.asList().iterator());
+			IteratorUtils.last(Arrays.asList().iterator()).get();
 		});
 	}
 	
 	
 	@Test
 	public void testFirst_Filter() {
-		assertEquals((Integer)7, IteratorUtils.first(Arrays.asList(1,2,7,0,8,0,3).iterator(), a -> a>5));
+		assertEquals((Integer)7, IteratorUtils.first(Arrays.asList(1,2,7,0,8,0,3).iterator(), a -> a>5).get());
 		
 		assertThrows(NoSuchElementException.class, () -> {
-			IteratorUtils.first(Arrays.asList(1,2,3).iterator(), a -> a>5);
+			IteratorUtils.first(Arrays.asList(1,2,3).iterator(), a -> a>5).get();
 		});
 		assertThrows(NoSuchElementException.class, () -> {
-			IteratorUtils.first(Arrays.<Integer>asList().iterator(), a -> a>5);
+			IteratorUtils.first(Arrays.<Integer>asList().iterator(), a -> a>5).get();
 		});
 	}
 	
 	@Test
 	public void testLast_Filter() {
-		assertEquals((Integer)8, IteratorUtils.last(Arrays.asList(1,2,7,0,8,0,3).iterator(), a -> a>5));
-		assertEquals((Integer)8, IteratorUtils.last(Arrays.asList(1,2,7,0,8).iterator(), a -> a>5));
-		assertEquals((Integer)8, IteratorUtils.last(Arrays.asList(1,8).iterator(), a -> a>5));
-		assertEquals((Integer)8, IteratorUtils.last(Arrays.asList(8,1).iterator(), a -> a>5));
+		assertEquals((Integer)8, IteratorUtils.last(Arrays.asList(1,2,7,0,8,0,3).iterator(), a -> a>5).get());
+		assertEquals((Integer)8, IteratorUtils.last(Arrays.asList(1,2,7,0,8).iterator(), a -> a>5).get());
+		assertEquals((Integer)8, IteratorUtils.last(Arrays.asList(1,8).iterator(), a -> a>5).get());
+		assertEquals((Integer)8, IteratorUtils.last(Arrays.asList(8,1).iterator(), a -> a>5).get());
 		
 		assertThrows(NoSuchElementException.class, () -> {
-			IteratorUtils.last(Arrays.asList(1,2,3).iterator(), a -> a>5);
+			IteratorUtils.last(Arrays.asList(1,2,3).iterator(), a -> a>5).get();
 		});
 		assertThrows(NoSuchElementException.class, () -> {
-			IteratorUtils.last(Arrays.<Integer>asList().iterator(), a -> a>5);
+			IteratorUtils.last(Arrays.<Integer>asList().iterator(), a -> a>5).get();
 		});
 	}
 	

assira/src/test/java/net/ranides/assira/collection/lists/ListUtilsTest.java

@@ -34,24 +34,24 @@ public class ListUtilsTest {
 		List<String> list1 = Arrays.asList("a");
 		List<String> list0 = Arrays.asList();
 		
-        assertEquals("a", ListUtils.first(list8));
-        assertEquals("a", ListUtils.first(list1));
+        assertEquals("a", ListUtils.first(list8).get());
+        assertEquals("a", ListUtils.first(list1).get());
 		
         assertThrows(NoSuchElementException.class, ()-> {
-			ListUtils.first(list0);
+			ListUtils.first(list0).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			ListUtils.first(list8, v -> false);
+			ListUtils.first(list8, v -> false).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			ListUtils.first(list8, 1, 3, v -> false);
+			ListUtils.first(list8, 1, 3, v -> false).get();
 		});
 		
-		assertEquals("b", ListUtils.first(list8, 1, 3, v -> true));
+		assertEquals("b", ListUtils.first(list8, 1, 3, v -> true).get());
 		
-		assertEquals("cc", ListUtils.first(list8, v -> v.length()>1));
-		assertEquals("cc", ListUtils.first(list8, 1, 3, v -> v.length()>1));
-		assertEquals("ee", ListUtils.first(list8, 3, 5, v -> v.length()>1));
+		assertEquals("cc", ListUtils.first(list8, v -> v.length()>1).get());
+		assertEquals("cc", ListUtils.first(list8, 1, 3, v -> v.length()>1).get());
+		assertEquals("ee", ListUtils.first(list8, 3, 5, v -> v.length()>1).get());
     }
 	
 	@Test
@@ -60,24 +60,24 @@ public class ListUtilsTest {
 		List<String> list1 = Arrays.asList("a");
 		List<String> list0 = Arrays.asList();
 		
-        assertEquals("h", ListUtils.last(list8));
-        assertEquals("a", ListUtils.last(list1));
+        assertEquals("h", ListUtils.last(list8).get());
+        assertEquals("a", ListUtils.last(list1).get());
 		
         assertThrows(NoSuchElementException.class, ()-> {
-			ListUtils.last(list0);
+			ListUtils.last(list0).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			ListUtils.last(list8, v -> false);
+			ListUtils.last(list8, v -> false).get();
 		});
 		assertThrows(NoSuchElementException.class, ()-> {
-			ListUtils.last(list8, 1, 3, v -> false);
+			ListUtils.last(list8, 1, 3, v -> false).get();
 		});
 		
-		assertEquals("d", ListUtils.last(list8, 1, 4, v -> true));
+		assertEquals("d", ListUtils.last(list8, 1, 4, v -> true).get());
 		
-		assertEquals("gg", ListUtils.last(list8, v -> v.length()>1));
-		assertEquals("ee", ListUtils.last(list8, 1, 6, v -> v.length()>1));
-		assertEquals("cc", ListUtils.last(list8, 1, 3, v -> v.length()>1));
+		assertEquals("gg", ListUtils.last(list8, v -> v.length()>1).get());
+		assertEquals("ee", ListUtils.last(list8, 1, 6, v -> v.length()>1).get());
+		assertEquals("cc", ListUtils.last(list8, 1, 3, v -> v.length()>1).get());
     }
 	
 	@Test

assira/src/test/java/net/ranides/assira/reflection/IArgumentsTest.java

@@ -81,9 +81,9 @@ public class IArgumentsTest {
         assertEquals(Arrays.asList(m2,m2), m2.arguments().parent().list());
         assertEquals(Arrays.asList(m3,m3), m3.arguments().parent().list());
         
-        assertEquals(ic, m1.arguments().parent().parent().first());
-        assertEquals(IClass.typeinfo(ForMethodUtils.A.class), m2.arguments().parent().parent().first());
-        assertEquals(IClass.typeinfo(ForMethodUtils.Root.class), m3.arguments().parent().parent().first());
+        assertEquals(ic, m1.arguments().parent().parent().first().get());
+        assertEquals(IClass.typeinfo(ForMethodUtils.A.class), m2.arguments().parent().parent().first().get());
+        assertEquals(IClass.typeinfo(ForMethodUtils.Root.class), m3.arguments().parent().parent().first().get());
         
     }
     

assira/src/test/java/net/ranides/assira/reflection/impl/AClassTest.java

@@ -85,7 +85,7 @@ public class AClassTest {
         assertEquals(true, ic.isInstance("hello"));
         
         assertThrows(NoSuchElementException.class, ()->{
-            ic.method("hello");
+            ic.method("hello").get();
         });
         assertThrows(NoSuchElementException.class, ()->{
             ic.parent();

assira/src/test/java/net/ranides/assira/reflection/impl/GContextTest.java

@@ -56,7 +56,7 @@ public class GContextTest {
         assertNotEquals(nec, ic.method("get").get().parent());
         
         assertEquals(ep2, ic.method("get").get().returns());
-        assertEquals(ep1, ic.method("put").get().arguments().types().first());
+        assertEquals(ep1, ic.method("put").get().arguments().types().first().get());
         
         Map<String, Type> expm = new HashMap<>();
         expm.put("K", List.class);

assira/src/test/java/net/ranides/assira/reflection/impl/RConstructorTest.java

@@ -42,7 +42,6 @@ public class RConstructorTest {
             MessageFormat.format("{0} {0}.{0}()", cn)
         );
         assertEquivalent(exp, ic.constructors().list(m -> m.toString()));
-        
         assertEquivalent(Arrays.asList("[R]", "[]", "[]", "[]"), ic.constructors().list(m -> m.params().toString()));
     }
     

assira/src/test/java/net/ranides/assira/reflection/impl/RFieldTest.java

@@ -34,7 +34,7 @@ public class RFieldTest {
         IField field = ca.field("name").get();
         IFields fields = field.collect();
         
-        assertSymEquals(field, fields.first());
+        assertSymEquals(field, fields.first().get());
     }
     
     @Test

assira/src/test/java/net/ranides/assira/reflection/impl/RMethodTest.java

@@ -79,10 +79,10 @@ public class RMethodTest {
         IClass<?> ic1 = IClass.typefor(o1);
         IClass<?> ic2 = IClass.typefor(o2);
         
-        String o1map1 = ic1.methods().require("map1").first().toString();
-        String o1map2 = ic1.methods().require("map2").first().toString();
-        String o2map1 = ic2.methods().require("map1").first().toString();
-        String o2map2 = ic2.methods().require("map2").first().toString();
+        String o1map1 = ic1.methods().require("map1").first().get().toString();
+        String o1map2 = ic1.methods().require("map2").first().get().toString();
+        String o2map1 = ic2.methods().require("map1").first().get().toString();
+        String o2map2 = ic2.methods().require("map2").first().get().toString();
         
         assertEquals(Arrays.asList("Q=>class java.lang.Double", "T=>class java.lang.Float"), asText(ic1.context()));
         assertEquals(Arrays.asList("Q=>class java.lang.Character", "T=>class java.lang.String"), asText(ic2.context()));

assira/src/test/java/net/ranides/assira/reflection/impl/bean/ABeanPropertyTest.java

@@ -168,7 +168,7 @@ public class ABeanPropertyTest {
         assertNull(p6.get(bean));
         
         assertThrows(NoSuchElementException.class, ()->{
-            model.property("something");
+            model.property("something").get();
         });
         
     }

assira/src/test/java/net/ranides/assira/reflection/impl/bean/RBeanModelTest.java

@@ -71,7 +71,7 @@ public class RBeanModelTest {
         BeanModel model = BeanModel.typeinfo(ForBeanModel.class);
         assertNotNull(model.method("open"));
         assertThrows(NoSuchElementException.class, ()->{
-            model.method("unknown");
+            model.method("unknown").get();
         });
     }
     

assira/src/test/java/net/ranides/assira/trace/ExceptionUtilsTest.java

@@ -53,7 +53,7 @@ public class ExceptionUtilsTest {
         String st = ExceptionUtils.getStackTrace(new IOException());
         assertTrue(st.contains("ExceptionUtilsTest"));
         assertTrue(st.contains("org.junit."));
-        assertTrue(st.contains("org.apache.maven."));
+        assertTrue(st.contains("org.apache.maven.") || st.contains("com.intellij.rt."));
     }
     
     @Test