Rename getNumberOfStaticTests to countStaticTests

junit-team · Nov 14, 2015 · 14390ec · 14390ec
1 parent c1680cf
commit 14390ec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/junit-console/src/main/java/org/junit/gen5/console/ColoredPrintingTestListener.java b/junit-console/src/main/java/org/junit/gen5/console/ColoredPrintingTestListener.java
@@ -36,7 +36,7 @@ public ColoredPrintingTestListener(PrintStream out) {
 
 	@Override
 	public void testPlanExecutionStarted(TestPlan testPlan) {
-		out.printf("Test execution started. Number of static tests: %d%n", testPlan.getNumberOfStaticTests());
+		out.printf("Test execution started. Number of static tests: %d%n", testPlan.countStaticTests());
 	}
 
 	@Override
@@ -115,7 +115,7 @@ void println(Color color, String format, Object... args) {
 		out.println(color + String.format(format, args) + NONE);
 	}
 
-	static enum Color {
+	enum Color {
 
 		NONE(0),
 

diff --git a/junit-console/src/main/java/org/junit/gen5/console/TestSummaryReportingTestListener.java b/junit-console/src/main/java/org/junit/gen5/console/TestSummaryReportingTestListener.java
@@ -44,7 +44,7 @@ public TestSummaryReportingTestListener(PrintStream out) {
 
 	@Override
 	public void testPlanExecutionStarted(TestPlan testPlan) {
-		this.testsFound.set(testPlan.getNumberOfStaticTests());
+		this.testsFound.set(testPlan.countStaticTests());
 		this.timeStarted = System.currentTimeMillis();
 	}
 
@@ -98,7 +98,7 @@ public void testStarted(TestDescriptor testDescriptor) {
 
 	@Override
 	public void testSkipped(TestDescriptor testDescriptor, Throwable t) {
-		this.testsSkipped.addAndGet(testDescriptor.getNumberOfStaticTests());
+		this.testsSkipped.addAndGet(testDescriptor.countStaticTests());
 	}
 
 	@Override

diff --git a/junit-engine-api/src/main/java/org/junit/gen5/engine/TestDescriptor.java b/junit-engine-api/src/main/java/org/junit/gen5/engine/TestDescriptor.java
@@ -50,7 +50,7 @@ default boolean isRoot() {
 
 	Set<TestDescriptor> getChildren();
 
-	default long getNumberOfStaticTests() {
+	default long countStaticTests() {
 		AtomicLong staticTests = new AtomicLong(0);
 		Visitor visitor = (descriptor, remove) -> {
 			if (descriptor.isTest())

diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/TestPlan.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/TestPlan.java
@@ -51,9 +51,8 @@ public Optional<EngineDescriptor> getEngineDescriptorFor(TestEngine testEngine)
 			descriptor -> descriptor.getEngine().equals(testEngine)).findFirst();
 	}
 
-	public long getNumberOfStaticTests() {
-		return this.engineDescriptors.stream().mapToLong(
-			engineDescriptor -> engineDescriptor.getNumberOfStaticTests()).sum();
+	public long countStaticTests() {
+		return this.engineDescriptors.stream().mapToLong(engineDescriptor -> engineDescriptor.countStaticTests()).sum();
 	}
 
 	@Override