From 6dd21ad7e04cec9405fd798e236808ed4acac954 Mon Sep 17 00:00:00 2001
From: Jan Rieke <it@janrieke.de>
Date: Sat, 14 Apr 2018 20:13:59 +0200
Subject: adjusted expected result of test case

---
 .../lombok/javac/handlers/HandleSuperBuilder.java  |   1 +
 .../resource/after-delombok/SuperBuilderBasic.java | 278 ++++++++++++---------
 2 files changed, 167 insertions(+), 112 deletions(-)

diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
index 7f0858d2..d30740c0 100644
--- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
@@ -236,6 +236,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 			for (BuilderFieldData bfd : builderFields) {
 				fieldNodes.addAll(bfd.createdFields);
 			}
+			// TODO: toString() should also call super.toString(), so that it also shows fields from the superclass.
 			JCMethodDecl md = HandleToString.createToString(builderType, fieldNodes, true, false, FieldAccess.ALWAYS_FIELD, ast);
 			if (md != null) injectMethod(builderType, md);
 		}
diff --git a/test/transform/resource/after-delombok/SuperBuilderBasic.java b/test/transform/resource/after-delombok/SuperBuilderBasic.java
index ffb56e0e..ed1f9bdc 100644
--- a/test/transform/resource/after-delombok/SuperBuilderBasic.java
+++ b/test/transform/resource/after-delombok/SuperBuilderBasic.java
@@ -1,112 +1,166 @@
-import java.util.List;
-
-public class SuperBuilderBasic {
-	public static class Parent {
-		int field1;
-		List<String> items;
-		protected Parent(final ParentBuilder<?, ?> b) {
-			this.field1 = b.field1;
-			java.util.List<String> items;
-			switch (b.items == null ? 0 : b.items.size()) {
-			case 0: 
-				items = java.util.Collections.emptyList();
-				break;
-			case 1: 
-				items = java.util.Collections.singletonList(b.items.get(0));
-				break;
-			default: 
-				items = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(b.items));
-			}
-			this.items = items;
-		}
-		private static class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
-			@Override
-			public Parent build() {
-				return new Parent(this);
-			}
-			
-			@Override
-			public ParentBuilderImpl self() {
-				return this;
-			}
-		}
-		public abstract static class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
-			@java.lang.SuppressWarnings("all")
-			private int field1;
-			@java.lang.SuppressWarnings("all")
-			private java.util.ArrayList<String> items;
-			@java.lang.SuppressWarnings("all")
-			ParentBuilder() {
-			}
-			@java.lang.SuppressWarnings("all")
-			public B field1(final int field1) {
-				this.field1 = field1;
-				return self();
-			}
-			@java.lang.SuppressWarnings("all")
-			public B item(final String item) {
-				if (this.items == null) this.items = new java.util.ArrayList<String>();
-				this.items.add(item);
-				return self();
-			}
-			@java.lang.SuppressWarnings("all")
-			public B items(final java.util.Collection<? extends String> items) {
-				if (this.items == null) this.items = new java.util.ArrayList<String>();
-				this.items.addAll(items);
-				return self();
-			}
-			@java.lang.SuppressWarnings("all")
-			public B clearItems() {
-				if (this.items != null) this.items.clear();
-				return self();
-			}
-			@java.lang.SuppressWarnings("all")
-			protected abstract B self();
-			@java.lang.SuppressWarnings("all")
-			public abstract C build();
-		}
-		public static ParentBuilder<?, ?> builder() {
-			return new ParentBuilderImpl();
-		}
-	}
-	public static class Child extends Parent {
-		double field3;
-		protected Child(ChildBuilder<?, ?> b) {
-			super(b);
-			this.field3 = b.field3;
-		}
-		private static class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
-			@Override
-			public Child build() {
-				return new Child(this);
-			}
-			
-			@Override
-			public ChildBuilderImpl self() {
-				return this;
-			}
-		}
-		public abstract static class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<Child, B> {
-			@java.lang.SuppressWarnings("all")
-			private double field3;
-			@java.lang.SuppressWarnings("all")
-			ChildBuilder() {
-			}
-			@java.lang.SuppressWarnings("all")
-			public B field3(final double field3) {
-				this.field3 = field3;
-				return self();
-			}
-			@java.lang.SuppressWarnings("all")
-			protected abstract B self();
-			@java.lang.SuppressWarnings("all")
-			public abstract C build();
-		}
-		public static ChildBuilder<?, ?> builder() {
-			return new ChildBuilderImpl();
-		}
-	}
-	public static void test() {
-		Child x = Child.builder().field3(0.0).field1(5).item("").build();
-	}
-}
+import java.util.List;
+
+public class SuperBuilderBasic {
+	public static class Parent {
+		int field1;
+		List<String> items;
+
+		@java.lang.SuppressWarnings("all")
+		protected Parent(final ParentBuilder<?, ?> b) {
+			this.field1 = b.field1;
+			java.util.List<String> items;
+			switch (b.items == null ? 0 : b.items.size()) {
+			case 0: 
+				items = java.util.Collections.emptyList();
+				break;
+
+			case 1: 
+				items = java.util.Collections.singletonList(b.items.get(0));
+				break;
+
+			default: 
+				items = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(b.items));
+			}
+			this.items = items;
+		}
+
+
+		@java.lang.SuppressWarnings("all")
+		public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+			@java.lang.SuppressWarnings("all")
+			private int field1;
+			@java.lang.SuppressWarnings("all")
+			private java.util.ArrayList<String> items;
+
+			@java.lang.SuppressWarnings("all")
+			protected abstract B self();
+
+			@java.lang.SuppressWarnings("all")
+			public abstract C build();
+
+			@java.lang.SuppressWarnings("all")
+			public B field1(final int field1) {
+				this.field1 = field1;
+				return self();
+			}
+
+			@java.lang.SuppressWarnings("all")
+			public B item(final String item) {
+				if (this.items == null) this.items = new java.util.ArrayList<String>();
+				this.items.add(item);
+				return self();
+			}
+
+			@java.lang.SuppressWarnings("all")
+			public B items(final java.util.Collection<? extends String> items) {
+				if (this.items == null) this.items = new java.util.ArrayList<String>();
+				this.items.addAll(items);
+				return self();
+			}
+
+			@java.lang.SuppressWarnings("all")
+			public B clearItems() {
+				if (this.items != null) this.items.clear();
+				return self();
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "SuperBuilderBasic.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")";
+			}
+		}
+
+
+		@java.lang.SuppressWarnings("all")
+		private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
+			@java.lang.SuppressWarnings("all")
+			private ParentBuilderImpl() {
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			protected ParentBuilderImpl self() {
+				return this;
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public Parent build() {
+				return new Parent(this);
+			}
+		}
+
+		@java.lang.SuppressWarnings("all")
+		public static ParentBuilder<?, ?> builder() {
+			return new ParentBuilderImpl();
+		}
+	}
+
+
+	public static class Child extends Parent {
+		double field3;
+
+		@java.lang.SuppressWarnings("all")
+		protected Child(final ChildBuilder<?, ?> b) {
+			super(b);
+			this.field3 = b.field3;
+		}
+
+
+		@java.lang.SuppressWarnings("all")
+		public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+			@java.lang.SuppressWarnings("all")
+			private double field3;
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			protected abstract B self();
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public abstract C build();
+
+			@java.lang.SuppressWarnings("all")
+			public B field3(final double field3) {
+				this.field3 = field3;
+				return self();
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "SuperBuilderBasic.Child.ChildBuilder(field3=" + this.field3 + ")";
+			}
+		}
+
+
+		@java.lang.SuppressWarnings("all")
+		private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
+			@java.lang.SuppressWarnings("all")
+			private ChildBuilderImpl() {
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			protected ChildBuilderImpl self() {
+				return this;
+			}
+
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public Child build() {
+				return new Child(this);
+			}
+		}
+
+		@java.lang.SuppressWarnings("all")
+		public static ChildBuilder<?, ?> builder() {
+			return new ChildBuilderImpl();
+		}
+	}
+
+	public static void test() {
+		Child x = Child.builder().field3(0.0).field1(5).item("").build();
+	}
+}
-- 
cgit