From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 19 Nov 2019 15:09:49 +0000 (+0100)
Subject: Remove use of xbase-lib in tests
X-Git-Tag: v4.0.8~9
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=58b7522fdbb4005f918fbf0a7353dc40ad071b79

Remove use of xbase-lib in tests

The way the expected object is constructed is horrible, just use
plain fluent builder without the extensions. This makes it more
clear and much more concise.

Change-Id: I042dfda9fadcc2b3764a449dfc34300f0928370b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java
index 843b7dd5c1..be384e90e3 100644
--- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java
+++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java
@@ -8,8 +8,6 @@
 package org.opendaylight.mdsal.binding.testutils;
 
 import java.util.Collections;
-import org.eclipse.xtext.xbase.lib.CollectionLiterals;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugmentBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.complex.from.grouping.ContainerWithUses;
@@ -48,28 +46,13 @@ public final class ExpectedObjects {
     }
 
     public static Top top() {
-        TopBuilder topBuilder = new TopBuilder();
-        final Procedure1<TopBuilder> _function = (TopBuilder it) -> {
-            TopLevelListBuilder topLevelListBuilder = new TopLevelListBuilder();
-            final Procedure1<TopLevelListBuilder> _function_1 = (TopLevelListBuilder it1) -> {
-                it1.setName("foo");
-                TreeComplexUsesAugmentBuilder treeComplexUsesAugmentBuilder = new TreeComplexUsesAugmentBuilder();
-                final Procedure1<TreeComplexUsesAugmentBuilder> _function_2 = (TreeComplexUsesAugmentBuilder it2) -> {
-                    ContainerWithUsesBuilder containerWithUsesBuilder = new ContainerWithUsesBuilder();
-                    final Procedure1<ContainerWithUsesBuilder> _function_3 =
-                        (ContainerWithUsesBuilder it3) -> it3.setLeafFromGrouping("foo");
-                    ContainerWithUses doubleGreaterThan = XtendBuilderExtensions.operator_doubleGreaterThan(
-                                    containerWithUsesBuilder, _function_3);
-                    it2.setContainerWithUses(doubleGreaterThan);
-                };
-                TreeComplexUsesAugment doubleGreaterThan = XtendBuilderExtensions.operator_doubleGreaterThan(
-                                treeComplexUsesAugmentBuilder, _function_2);
-                it1.addAugmentation(TreeComplexUsesAugment.class, doubleGreaterThan);
-            };
-            TopLevelList doubleGreaterThan =
-                XtendBuilderExtensions.operator_doubleGreaterThan(topLevelListBuilder, _function_1);
-            it.setTopLevelList(Collections.unmodifiableList(CollectionLiterals.newArrayList(doubleGreaterThan)));
-        };
-        return XtendBuilderExtensions.operator_doubleGreaterThan(topBuilder, _function);
+        return new TopBuilder()
+                .setTopLevelList(Collections.singletonList(new TopLevelListBuilder()
+                    .setName("foo")
+                    .addAugmentation(TreeComplexUsesAugment.class, new TreeComplexUsesAugmentBuilder()
+                        .setContainerWithUses(new ContainerWithUsesBuilder().setLeafFromGrouping("foo").build())
+                        .build())
+                    .build()))
+                .build();
     }
 }