Merge pull request #26 from joutvhu/development

Fix Alignment

Author: joutvhu

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'com.github.joutvhu'
-version '1.1.2'
+version '1.1.3'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
@@ -46,6 +46,7 @@ dependencies {
 
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.6.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.2'
 

src/main/java/com/joutvhu/fixedwidth/parser/support/FixedStringAssembler.java

@@ -150,10 +150,10 @@ public StringAssembler pad(FixedTypeInfo info, Alignment defaultAlignment) {
 
             switch (alignment) {
                 case LEFT:
-                    value = CommonUtil.leftPadValue(value, length, padding);
+                    value = CommonUtil.rightPadValue(value, length, padding);
                     break;
                 case RIGHT:
-                    value = CommonUtil.rightPadValue(value, length, padding);
+                    value = CommonUtil.leftPadValue(value, length, padding);
                     break;
                 case CENTER:
                     value = CommonUtil.centerPadValue(value, length, padding);
@@ -191,10 +191,10 @@ public StringAssembler trim(FixedTypeInfo info, Alignment defaultAlignment) {
 
             switch (alignment) {
                 case LEFT:
-                    value = CommonUtil.trimLeftBy(value, padding);
+                    value = CommonUtil.trimRightBy(value, padding);
                     break;
                 case RIGHT:
-                    value = CommonUtil.trimRightBy(value, padding);
+                    value = CommonUtil.trimLeftBy(value, padding);
                     break;
                 case CENTER:
                     value = CommonUtil.trimBy(value, padding);

src/main/java/com/joutvhu/fixedwidth/parser/support/FixedTypeInfo.java

@@ -159,8 +159,8 @@ public boolean getDefaultKeepPadding() {
     public Alignment getDefaultAlignment() {
         if (alignment == null || Alignment.AUTO.equals(alignment)) {
             if (TypeConstants.INTEGER_NUMBER_TYPES.contains(type) || TypeConstants.DECIMAL_NUMBER_TYPES.contains(type))
-                return Alignment.LEFT;
-            return Alignment.RIGHT;
+                return Alignment.RIGHT;
+            return Alignment.LEFT;
         }
         return alignment;
     }

src/main/java/com/joutvhu/fixedwidth/parser/util/CommonUtil.java

@@ -141,8 +141,8 @@ public String centerPadValue(String value, int size, char pad) {
         else if (len < size) {
             int padSize = size - len;
             int halfSize = padSize / 2;
-            return StringUtils.repeat(pad, (padSize & 1) == 0 ? halfSize + 1 : halfSize) +
-                    value + StringUtils.repeat(pad, halfSize);
+            return StringUtils.repeat(pad, halfSize) + value +
+                    StringUtils.repeat(pad, (padSize & 1) == 0 ? halfSize + 1 : halfSize);
         } else return StringUtils.substring(value, 0, size);
     }
 

src/test/java/com/joutvhu/fixedwidth/parser/AlignmentTests.java

@@ -0,0 +1,92 @@
+package com.joutvhu.fixedwidth.parser;
+
+import com.joutvhu.fixedwidth.parser.annotation.FixedField;
+import com.joutvhu.fixedwidth.parser.annotation.FixedObject;
+import com.joutvhu.fixedwidth.parser.domain.Alignment;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class AlignmentTests {
+
+    private FixedParser fixedParser;
+
+    @BeforeAll
+    public void beforeTest() {
+        this.fixedParser = FixedParser.parser();
+    }
+
+    @ParameterizedTest
+    @MethodSource("samples")
+    void validateFormattedFieldWithPadding(Sample sample) {
+        String output = fixedParser.export(sample.person);
+
+        assertEquals(sample.expected, output);
+    }
+
+    @SuppressWarnings("unused")
+    static List<Sample> samples() {
+        return Arrays.asList(
+                new Sample(new AutoPerson("Bob"), "Bob       "),
+
+                // FIXME "left" alignment means padding to the right to me
+                new Sample(new LeftPerson("Bob"), "Bob       "),
+
+                // FIXME "right" alignment means padding to the left for me
+                new Sample(new RightPerson("Bob"), "       Bob"),
+
+                new Sample(new CenterPerson("Bob"), "   Bob    "),
+
+                // FIXME fixed length = 10, "Emma".length = 4, this means 3 chars to the left, and 3 chars to the right
+                new Sample(new CenterPerson("Emma"), "   Emma   ")
+        );
+    }
+
+    @Data
+    @AllArgsConstructor
+    static class Sample {
+        private Object person;
+        private String expected;
+    }
+
+    @FixedObject
+    @Data
+    @AllArgsConstructor
+    public static class AutoPerson {
+        @FixedField(length = 10, alignment = Alignment.AUTO)
+        private String name;
+    }
+
+    @FixedObject
+    @Data
+    @AllArgsConstructor
+    public static class LeftPerson {
+        @FixedField(length = 10, alignment = Alignment.LEFT)
+        private String name;
+    }
+
+    @FixedObject
+    @Data
+    @AllArgsConstructor
+    public static class RightPerson {
+        @FixedField(length = 10, alignment = Alignment.RIGHT)
+        private String name;
+    }
+
+    @FixedObject
+    @Data
+    @AllArgsConstructor
+    public static class CenterPerson {
+        @FixedField(length = 10, alignment = Alignment.CENTER)
+        private String name;
+    }
+}