Don't output trailing spaces in Printer

Also don't output trailing empty lines in TestGenerator
This commit is contained in:
Alexander Udalov
2014-10-17 21:25:33 +04:00
parent 4d9ef1042d
commit bc9aa9e34f
4 changed files with 30 additions and 13 deletions
@@ -31,6 +31,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
public class TestGenerator {
@@ -156,19 +157,24 @@ public class TestGenerator {
p.pushIndent();
Collection<TestMethodModel> testMethods = testClassModel.getTestMethods();
Collection<TestClassModel> innerTestClasses = testClassModel.getInnerTestClasses();
for (TestMethodModel testMethodModel : testMethods) {
for (Iterator<TestMethodModel> iterator = testMethods.iterator(); iterator.hasNext(); ) {
TestMethodModel testMethodModel = iterator.next();
generateTestMethod(p, testMethodModel);
p.println();
if (iterator.hasNext() || !innerTestClasses.isEmpty()) {
p.println();
}
}
Collection<TestClassModel> innerTestClasses = testClassModel.getInnerTestClasses();
for (TestClassModel innerTestClass : innerTestClasses) {
if (innerTestClass.isEmpty()) {
continue;
for (Iterator<TestClassModel> iterator = innerTestClasses.iterator(); iterator.hasNext(); ) {
TestClassModel innerTestClass = iterator.next();
if (!innerTestClass.isEmpty()) {
generateTestClass(p, innerTestClass, true);
if (iterator.hasNext()) {
p.println();
}
}
generateTestClass(p, innerTestClass, true);
p.println();
}
p.popIndent();