add diamond with name feature

Author: albadc

src/main/java/edu/thoughtworks/training/Asterisk.java

@@ -26,17 +26,21 @@ public String printVerticalLine(int numberOfLines) {
 
  public String printRightTriangle(int numberOfLines) {
  StringBuilder builder = new StringBuilder();
- for (int i = 1; i <= numberOfLines; ++i) builder.append(printHorizontalLine(i)).append(END_OF_LINE);
+ for (int i = 1; i <= numberOfLines; ++i) {
+ builder
+ .append(printHorizontalLine(i))
+ .append(END_OF_LINE);
+ }
  return builder.toString();
  }
 
  public String printIsoscelesTriangle(int numberOfLines) {
+ int numberOfAsterisks = 2 * numberOfLines - 1;
  StringBuilder builder = new StringBuilder();
- for (int i = 0; i < numberOfLines; ++i) {
- int initialSpaces = numberOfLines - i - 1;
- int leftAsterisks = 2 * i + 1;
- builder.append(printSpaces(initialSpaces)).append(printHorizontalLine(leftAsterisks)).append(END_OF_LINE);
- }
+ builder
+ .append(printIsoscelesTriangleWithInitialSpaces(numberOfLines - 1))
+ .append(printHorizontalLine(numberOfAsterisks))
+ .append(END_OF_LINE);
  return builder.toString();
  }
 
@@ -48,7 +52,9 @@ String printSpaces(int numberOfSpaces) {
 
  public String printDiamond(int n) {
  StringBuilder builder = new StringBuilder();
- builder.append(printIsoscelesTriangle(n)).append(printInvertedIsoscelesTriangleWithInitialSpaces(n-1));
+ builder
+ .append(printIsoscelesTriangle(n))
+ .append(printInvertedIsoscelesTriangleWithInitialSpaces(n - 1));
  return builder.toString();
  }
 
@@ -57,12 +63,33 @@ String printInvertedIsoscelesTriangleWithInitialSpaces(int n) {
  for (int i = 0; i < n; ++i) {
  int initialSpaces = i+1;
  int leftAsterisks = 2*(n-i)-1;
- builder.append(printSpaces(initialSpaces)).append(printHorizontalLine(leftAsterisks)).append(END_OF_LINE);
+ builder
+ .append(printSpaces(initialSpaces))
+ .append(printHorizontalLine(leftAsterisks))
+ .append(END_OF_LINE);
  }
  return builder.toString();
  }
 
  public String printDiamondWithName(int n, String someName) {
- return null;
+ StringBuilder builder = new StringBuilder();
+ builder
+ .append(printIsoscelesTriangleWithInitialSpaces(n - 1))
+ .append(someName).append(END_OF_LINE)
+ .append(printInvertedIsoscelesTriangleWithInitialSpaces(n - 1));
+ return builder.toString();
+ }
+
+ String printIsoscelesTriangleWithInitialSpaces(int numberOfLines) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < numberOfLines; ++i) {
+ int initialSpaces = numberOfLines - i;
+ int leftAsterisks = 2 * i + 1;
+ builder
+ .append(printSpaces(initialSpaces))
+ .append(printHorizontalLine(leftAsterisks))
+ .append(END_OF_LINE);
+ }
+ return builder.toString();
  }
 }

src/test/java/edu/thoughtworks/training/AsteriskShould.java

@@ -38,6 +38,11 @@ public class AsteriskShould {
  "Some name\n" +
  " ***\n" +
  " *\n";
+ private static final String ISOSCELES_TRIANGLE_WITH_SPACES =
+ " *\n" +
+ " ***\n" +
+ " *****\n" +
+ " *******\n";
 
  private Asterisk asterisk;
 
@@ -108,8 +113,16 @@ public void printInvertedIsoscelesTriangle() {
  @Test
  public void printDiamondWithName() {
  int n = 3;
- assertEquals("Asterisks don't print an inverted isosceles triangle",
+ assertEquals("Asterisks don't print a diamond with name",
  DIAMOND_WITH_NAME,
  asterisk.printDiamondWithName(n, "Some name"));
  }
+
+ @Test
+ public void printIsoscelesTriangleWithInitialSpaces() {
+ int n = 4;
+ assertEquals("Asterisks don't print an isosceles triangle with spaces",
+ ISOSCELES_TRIANGLE_WITH_SPACES,
+ asterisk.printIsoscelesTriangleWithInitialSpaces(n));
+ }
 }