improvements type inference of type intersections (affects ValLambda.java, ValWeirdTypes.java tests)

2 files changed, 10 insertions, 4 deletions

diff --git a/test/transform/resource/after-ecj/ValLambda.java b/test/transform/resource/after-ecj/ValLambda.java
index 4bf3265b..4e2b97a1 100644
--- a/test/transform/resource/after-ecj/ValLambda.java
+++ b/test/transform/resource/after-ecj/ValLambda.java
@@ -7,9 +7,9 @@ class ValLambda {
 };
   }
   public void easyIntersectionLambda() {
-    final @lombok.val java.lang.Object foo = (Runnable & java.io.Serializable) () -> {
+    final @lombok.val java.lang.Runnable foo = (Runnable & java.io.Serializable) () -> {
 };
-    final @lombok.val java.lang.Object bar = (java.io.Serializable & Runnable) () -> {
+    final @lombok.val java.io.Serializable bar = (java.io.Serializable & Runnable) () -> {
 };
   }
   public void easyLubLambda() {
diff --git a/test/transform/resource/after-ecj/ValWeirdTypes.java b/test/transform/resource/after-ecj/ValWeirdTypes.java
index 9f448db9..e98b9753 100644
--- a/test/transform/resource/after-ecj/ValWeirdTypes.java
+++ b/test/transform/resource/after-ecj/ValWeirdTypes.java
@@ -63,8 +63,14 @@ public class ValWeirdTypes<Z> {
     final @val int singleInt = copy[0];
   }
   public void arraysAsList() {
-    final @val java.util.List<java.lang.Class<? extends java.lang.Object>> x = Arrays.asList(String.class, BigDecimal.class);
-    for (final @val java.lang.Class<? extends java.lang.Object> y : x) 
+    final @val java.util.List<java.lang.Class<? extends java.io.Serializable>> x = Arrays.asList(String.class, BigDecimal.class);
+    for (final @val java.lang.Class<? extends java.io.Serializable> y : x)
+      {
+      }
+  }
+  public @SuppressWarnings("all") void arraysAsList2() {
+    final @val java.util.List<java.lang.Class<? extends java.lang.Comparable>> x = Arrays.asList(String.class, BigDecimal.class, Comparable.class);
+    for (final @val java.lang.Class<? extends java.lang.Comparable> y : x)
       {
       }
   }