Fix generate of comma before augmentations in toString generator

[mdsal.git] / binding / mdsal-binding-java-api-generator / src / test / java / org / opendaylight / yangtools / sal / java / api / generator / BuilderGeneratorTest.java

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGeneratorTest.java
index 7385e7fec0231c3dbef5c4d59aac462a41044ce3..4f56de880c35d6a67b035fd2c53019a413110c10 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGeneratorTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGeneratorTest.java
@@ -28,14 +28,15 @@ public class BuilderGeneratorTest {
 
     private static final String PROPERTIES_FIELD_NAME = "properties";
     private static final String GEN_TO_STRING_FIRST_PART =
-            "@Override\npublic java.lang.String toString() {\n    java.lang.StringBuilder builder = new java.lang.StringBuilder ("
-                    + "\"test [\");";
+            "@Override\npublic java.lang.String toString() {\n    java.lang.String name = \"test [\";\n    "
+                    + "java.lang.StringBuilder builder = new java.lang.StringBuilder (name);";
     private static final String GEN_TO_STRING_LAST_PART = "\n    return builder.append(']').toString();\n}\n";
     private static final String GEN_TO_STRING_AUGMENT_PART =
             "\n    builder.append(\"augmentation=\");\n    builder.append(augmentation.values());";
     private static final String APPEND_COMMA = "builder.append(\", \");";
-    private static final String APPEND_COMMA_AUGMENT = "int builderLength = builder.length();\n"
-            + "    if (builderLength > 2 && !builder.substring(builderLength - 2, builderLength).equals(\", \")) {\n"
+    private static final String APPEND_COMMA_AUGMENT = "final int builderLength = builder.length();\n"
+            + "    final int builderAdditionalLength = builder.substring(name.length(), builderLength).length();\n"
+            + "    if (builderAdditionalLength > 2 && !builder.substring(builderLength - 2, builderLength).equals(\", \")) {\n"
             + "        " + APPEND_COMMA + "\n" + "    }";
     private static final String TEST = "test";