Fixed comb. of `@` mod and 4-param ~A dir.

Fixed the combination of the `@` mod and the 4-parameter form of the ~A
directive. Previously, this would add an excessive amount of padding to
the output.

Also added some test cases for this, and fixed another similar padding
bug.

1 files changed, 12 insertions, 0 deletions

diff --git a/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
index b14a6b3..d3d7075 100644
--- a/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
+++ b/clformat/src/test/java/bjc/utils/test/ioutils/CLFormatterTest.java
@@ -110,11 +110,23 @@ public class CLFormatterTest {
 	}
 
 	@Test
+	public void testADirective() {
+		assertFormat("foo", "~A", "foo");
+		assertFormat("foobar ", "~7A", "foobar");
+		assertFormat(" foobar", "~7@A", "foobar");
+		assertFormat("   foobar", "~#mincol;8,#colinc;2,#minpad;1,#padchar;' @A", "foobar");
+	}
+
+	@Test
 	public void testRandomCases() {
 		// Random test cases
 		assertEquals("3 dogs are here", format("~D dog~:[s are~; is~] here", 3, 3 == 1));
 	}
 
+	private void assertFormat(String res, String fmt, Object... params) {
+		assertEquals(res, format(fmt, params));
+	}
+
 	private String format(String str, Object... params) {
 		try {
 			return fmt.formatString(str, params);