From 16fc34f36c77832b2bb7d383105c0b4c4dc5ddb6 Mon Sep 17 00:00:00 2001
From: Jan Rieke <rieke@subshell.com>
Date: Thu, 16 Aug 2018 18:37:34 +0200
Subject: adapted existing tests to changed default assignment generation

---
 .../resource/after-delombok/SuperBuilderWithDefaults.java | 12 ++++++------
 .../resource/after-ecj/SuperBuilderWithDefaults.java      | 15 +++++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'test/transform')

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java
index 06d88f4d..17707bf5 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java
@@ -61,10 +61,10 @@ public class SuperBuilderWithDefaults {
 		}
 		@java.lang.SuppressWarnings("all")
 		protected Parent(final ParentBuilder<N, ?, ?> b) {
-			this.millis = b.millis;
-			if (!b.millis$set) this.millis = Parent.<N>$default$millis();
-			this.numberField = b.numberField;
-			if (!b.numberField$set) this.numberField = Parent.<N>$default$numberField();
+			if (b.millis$set) this.millis = b.millis;
+			 else this.millis = Parent.<N>$default$millis();
+			if (b.numberField$set) this.numberField = b.numberField; 
+			 else this.numberField = Parent.<N>$default$numberField();
 		}
 		@java.lang.SuppressWarnings("all")
 		public static <N extends Number> ParentBuilder<N, ?, ?> builder() {
@@ -120,8 +120,8 @@ public class SuperBuilderWithDefaults {
 		@java.lang.SuppressWarnings("all")
 		protected Child(final ChildBuilder<?, ?> b) {
 			super(b);
-			this.doubleField = b.doubleField;
-			if (!b.doubleField$set) this.doubleField = Child.$default$doubleField();
+			if (b.doubleField$set) this.doubleField = b.doubleField;
+			 else this.doubleField = Child.$default$doubleField();
 		}
 		@java.lang.SuppressWarnings("all")
 		public static ChildBuilder<?, ?> builder() {
diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java
index 731bd9f2..ef0713c5 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java
@@ -46,11 +46,13 @@ public class SuperBuilderWithDefaults {
     }
     protected @java.lang.SuppressWarnings("all") Parent(final ParentBuilder<N, ?, ?> b) {
       super();
-      this.millis = b.millis;
-      if ((! b.millis$set))
+      if (b.millis$set)
+          this.millis = b.millis;
+      else
           this.millis = Parent.<N>$default$millis();
-      this.numberField = b.numberField;
-      if ((! b.numberField$set)) 
+      if (b.numberField$set)
+          this.numberField = b.numberField;
+      else
           this.numberField = Parent.<N>$default$numberField();
     }
     public static @java.lang.SuppressWarnings("all") <N extends Number>ParentBuilder<N, ?, ?> builder() {
@@ -92,8 +94,9 @@ public class SuperBuilderWithDefaults {
     }
     protected @java.lang.SuppressWarnings("all") Child(final ChildBuilder<?, ?> b) {
       super(b);
-      this.doubleField = b.doubleField;
-      if ((! b.doubleField$set)) 
+      if (b.doubleField$set) 
+          this.doubleField = b.doubleField;
+      else
           this.doubleField = Child.$default$doubleField();
     }
     public static @java.lang.SuppressWarnings("all") ChildBuilder<?, ?> builder() {
-- 
cgit