refactoring: names

assira.junit/src/main/java/net/ranides/assira/junit/InterfaceTest.java

@@ -17,6 +17,6 @@ import java.lang.annotation.Target;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD})
-public @interface InterfaceTest {
+public @interface TestContract {
     
 }

assira.junit/src/main/java/net/ranides/assira/junit/InterfaceSuite.java

@@ -34,7 +34,7 @@ import org.junit.Ignore;
  * the first one for {@codee HashMap}.
  * @author Ranides Atterwim <ranides@gmail.com>
  */
-public class InterfaceSuite {
+public class TestContractRunner {
 	
 	private final SortedSet<MethodRunner> methods = new TreeSet<>();
     
@@ -48,26 +48,26 @@ public class InterfaceSuite {
 	
     private boolean debug = DEBUG;
 
-    public InterfaceSuite(PrintStream output) {
+    public TestContractRunner(PrintStream output) {
         this.output = output;
     }
     
-	public InterfaceSuite debug(boolean value) {
+	public TestContractRunner debug(boolean value) {
         this.debug = value;
 		return this;
 	}
 	
-    public InterfaceSuite ignore(String method) {
+    public TestContractRunner ignore(String method) {
         this.ignored.add(Pattern.compile(Pattern.quote(method)));
         return this;
     }
 	
-	public InterfaceSuite ignore(Pattern method) {
+	public TestContractRunner ignore(Pattern method) {
         this.ignored.add(method);
         return this;
     }
 	
-	public InterfaceSuite append(Object tester) {
+	public TestContractRunner append(Object tester) {
         testers.add(new TesterWrapper(tester));
         for(Method m : tester.getClass().getMethods()) {
             if(Modifier.isStatic(m.getModifiers()) ) {
@@ -79,7 +79,7 @@ public class InterfaceSuite {
             if(null != m.getAnnotation(Ignore.class)) {
                 continue;
             }
-            if(null == m.getAnnotation(InterfaceTest.class)) {
+            if(null == m.getAnnotation(TestContract.class)) {
                 continue;
             }
             if(!m.getReturnType().equals(void.class)) {
@@ -93,7 +93,7 @@ public class InterfaceSuite {
 		return this;
 	}
     
-    public InterfaceSuite param(String name, Object value) {
+    public TestContractRunner param(String name, Object value) {
         testers.stream().forEach((t) -> {
             t.param(name, value);
         });

assira.junit/src/test/java/net/ranides/assira/junit/InterfaceSuiteTest.java

@@ -28,7 +28,7 @@ import org.junit.Test;
  *
  * @author Ranides Atterwim <ranides@gmail.com>
  */
-public class InterfaceSuiteTest {
+public class TestContractRunnerTest {
     
     private static final List<String> EXPECTED = Arrays.asList(
         "ABC.findFirst",
@@ -77,7 +77,7 @@ public class InterfaceSuiteTest {
 
     @Test
     public void testRun() {
-        InterfaceSuite suite = new InterfaceSuite(System.err)
+        TestContractRunner suite = new TestContractRunner(System.err)
             .append(new Testers.ForA1())
             .append(new Testers.ForB())
             .append(new Testers.ForC())
@@ -94,13 +94,13 @@ public class InterfaceSuiteTest {
     @Test
     public void testInvalid() {
         NewAssert.assertThrows(AssertionError.class, () ->
-            new InterfaceSuite(System.err).append(new Testers.Invalid())
+            new TestContractRunner(System.err).append(new Testers.Invalid())
         );
     }
     
     @Test
     public void testCorrect() {
-        InterfaceSuite suite = new InterfaceSuite(System.err)
+        TestContractRunner suite = new TestContractRunner(System.err)
             .append(new Testers.Correct());
 
         TesterObjects.OUT.clear();
@@ -111,7 +111,7 @@ public class InterfaceSuiteTest {
     @Test
     public void testSupport() {
         TeeStream out = new TeeStream(System.err);
-        InterfaceSuite suite = new InterfaceSuite(new PrintStream(out))
+        TestContractRunner suite = new TestContractRunner(new PrintStream(out))
             .append(new Testers.ForSupport())
             .ignore("ForSupport.ignored")
             .ignore(Pattern.compile(".*Method4Pa.*"))
@@ -129,7 +129,7 @@ public class InterfaceSuiteTest {
     public void testMapSupplier() {
         TesterObjects.OUT.clear();
         
-        new InterfaceSuite(System.err)
+        new TestContractRunner(System.err)
             .append(new Testers.ForMap())
             .run(() -> new TreeMap<>());
         Assert.assertEquals(Arrays.asList("map"), TesterObjects.OUT);
@@ -138,7 +138,7 @@ public class InterfaceSuiteTest {
     @Test
     public void testWildcardSupplier() {
         NewAssert.assertThrows(AssertionError.class, ()->{
-            new InterfaceSuite(System.err)
+            new TestContractRunner(System.err)
                 .append(new Testers.ForWildcard())
                 .run(() -> new TreeMap<>());
         });
@@ -147,7 +147,7 @@ public class InterfaceSuiteTest {
     @Test
     public void testFunction() {
         TesterObjects.OUT.clear();
-        new InterfaceSuite(System.err)
+        new TestContractRunner(System.err)
             .append(new Testers.ForFunction())
             .run((int[] args) -> new ArrayList<>());
         Assert.assertEquals(EXPECTED_FUNCTION, TesterObjects.OUT);
@@ -156,7 +156,7 @@ public class InterfaceSuiteTest {
     @Test
     public void testResources() {
         TesterObjects.OUT.clear();
-        InterfaceSuite suite = new InterfaceSuite(System.err)
+        TestContractRunner suite = new TestContractRunner(System.err)
             .append(new Testers.ForResource());
         suite
             .param("name", "ranides")

assira.junit/src/test/java/net/ranides/assira/junit/mockup/Testers.java

@@ -11,7 +11,7 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import javax.annotation.Resource;
-import net.ranides.assira.junit.InterfaceTest;
+import net.ranides.assira.junit.TestContract;
 import net.ranides.assira.junit.mockup.TesterObjects.*;
 import net.ranides.assira.junit.mockup.TesterInterfaces.*;
 import org.junit.Ignore;
@@ -25,7 +25,7 @@ public class Testers {
     
     public static class ForA1 {
 
-        @InterfaceTest
+        @TestContract
         public void run(IntA object) {
             object.findFirst();
             object.findAll();
@@ -35,7 +35,7 @@ public class Testers {
         
     public static class ForA2 {
 
-        @InterfaceTest
+        @TestContract
         public void exec(IntA object) {
             TesterObjects.OUT.add("ForA2.exec");
         }
@@ -44,17 +44,17 @@ public class Testers {
     
     public static class ForFunction {
 
-        @InterfaceTest
+        @TestContract
         public void supplier(Supplier<List<String>> s) {
             TesterObjects.OUT.add("ForFunction.supplier");
         }
         
-        @InterfaceTest
+        @TestContract
         public void function(Function<int[], List<String>> f) {
             TesterObjects.OUT.add("ForFunction.function");
         }
         
-        @InterfaceTest
+        @TestContract
         public void list(List<String> list) {
             TesterObjects.OUT.add("ForFunction.list");
         }
@@ -63,18 +63,18 @@ public class Testers {
     
     public static class ForSupport {
 
-        @InterfaceTest
+        @TestContract
         public void run(IntA object) {
             object.findFirst();
             object.findAll();
         }
         
-        @InterfaceTest
+        @TestContract
         public void ignored(IntA object) {
             throw new NumberFormatException();
         }
 		
-		@InterfaceTest
+		@TestContract
         public void otherMethod4Pattern(IntA object) {
             throw new NumberFormatException();
         }
@@ -83,13 +83,13 @@ public class Testers {
     
     public static class Invalid {
 
-        @InterfaceTest
+        @TestContract
         public void run(IntA object) {
             object.findFirst();
             object.findAll();
         }
         
-        @InterfaceTest
+        @TestContract
         public void other(IntA object, int params) {
             object.findFirst();
             object.findAll();
@@ -99,14 +99,14 @@ public class Testers {
     
     public static class Correct {
 
-        @InterfaceTest
+        @TestContract
         public void run(IntA object) {
             object.findFirst();
             object.findAll();
         }
         
         @Ignore
-        @InterfaceTest
+        @TestContract
         public void other(IntA object, int params) {
             object.findFirst();
             object.findAll();
@@ -116,12 +116,12 @@ public class Testers {
 
     public static class ForB {
 
-        @InterfaceTest
+        @TestContract
         public void runO(IntB object) {
             object.open();
         }
 
-        @InterfaceTest
+        @TestContract
         public void runC(IntB object) {
             object.close();
         }
@@ -130,17 +130,17 @@ public class Testers {
 
     public static class ForC {
 
-        @InterfaceTest
+        @TestContract
         public void runR(IntC object) {
             object.read();
         }
 
-        @InterfaceTest
+        @TestContract
         public void runW(IntC object) {
             object.write();
         }
         
-        @InterfaceTest
+        @TestContract
         public void runZ(Supplier<IntC> function) {
             function.get().next();
         }
@@ -149,7 +149,7 @@ public class Testers {
     
     public static class ForAbstractAB {
         
-        @InterfaceTest
+        @TestContract
         public void exec(AbstractAB that) {
             TesterObjects.OUT.add("ForAbstractAB.exec");
         }
@@ -158,7 +158,7 @@ public class Testers {
     
     public static class ForMap {
         
-        @InterfaceTest
+        @TestContract
         public void exec(Supplier<Map<Integer, String>> supplier) {
             TesterObjects.OUT.add("map");
         }
@@ -167,7 +167,7 @@ public class Testers {
     
     public static class ForWildcard {
         
-        @InterfaceTest
+        @TestContract
         public void wildcard(Supplier<? extends Map<Integer, String>> supplier) {
             TesterObjects.OUT.add("map");
         }
@@ -182,7 +182,7 @@ public class Testers {
         @Resource(name="count!")
         private int count;
         
-        @InterfaceTest
+        @TestContract
         public void run(Object input) {
             TesterObjects.OUT.add("n=" +name + " c="+count);
         }