renamed and moved classes in plumbing package

main/java/org/testory/TestoryFacade.java

@@ -11,10 +11,6 @@
 import static org.testory.plumbing.format.QuietFormatter.quiet;
 import static org.testory.plumbing.history.RawHistory.newRawHistory;
 import static org.testory.plumbing.history.SynchronizedHistory.synchronize;
-import static org.testory.plumbing.im.wildcard.Repairer.repairer;
-import static org.testory.plumbing.im.wildcard.Tokenizer.tokenizer;
-import static org.testory.plumbing.im.wildcard.WildcardMatcherizer.wildcardMatcherizer;
-import static org.testory.plumbing.im.wildcard.WildcardSupport.wildcardSupport;
 import static org.testory.plumbing.inject.ArrayMaker.singletonArray;
 import static org.testory.plumbing.inject.ChainedMaker.chain;
 import static org.testory.plumbing.inject.FinalMaker.finalMaker;
@@ -25,12 +21,16 @@
 import static org.testory.plumbing.mock.SaneMockMaker.sane;
 import static org.testory.plumbing.mock.UniqueNamer.uniqueNamer;
 import static org.testory.plumbing.verify.Verifier.verifier;
+import static org.testory.plumbing.wildcard.Matcherizer.matcherizer;
+import static org.testory.plumbing.wildcard.Repairer.repairer;
+import static org.testory.plumbing.wildcard.Tokenizer.tokenizer;
+import static org.testory.plumbing.wildcard.Wildcarder.wildcarder;
 import static org.testory.proxy.extra.Overrider.overrider;
 import static org.testory.proxy.proxer.CglibProxer.cglibProxer;
 import static org.testory.proxy.proxer.FixObjectBugProxer.fixObjectBug;
 import static org.testory.proxy.proxer.JdkCollectionsProxer.jdkCollections;
 import static org.testory.proxy.proxer.NonFinalProxer.nonFinal;
-import static org.testory.proxy.proxer.RepeatableProxy.repeatable;
+import static org.testory.proxy.proxer.RepeatableProxer.repeatable;
 import static org.testory.proxy.proxer.TypeSafeProxer.typeSafe;
 
 import org.testory.common.PageFormatter;
@@ -40,7 +40,7 @@
 import org.testory.plumbing.facade.Facade;
 import org.testory.plumbing.format.QuietFormatter;
 import org.testory.plumbing.history.History;
-import org.testory.plumbing.im.wildcard.WildcardSupport;
+import org.testory.plumbing.wildcard.Wildcarder;
 import org.testory.proxy.Proxer;
 import org.testory.proxy.extra.Overrider;
 
@@ -54,11 +54,11 @@ public static Facade testoryFacade() {
     Proxer proxer = nonFinal(typeSafe(jdkCollections(fixObjectBug(repeatable(cglibProxer())))));
     Overrider overrider = overrider(proxer);
     Maker mockMaker = sane(history, nice(history, rawMockMaker(history, checkingProxer(checker, proxer))));
-    WildcardSupport wildcardSupport = wildcardSupport(
+    Wildcarder wildcarder = wildcarder(
         history,
         tokenizer(proxer),
         repairer(checker),
-        wildcardMatcherizer(formatter),
+        matcherizer(formatter),
         formatter);
 
     Configuration configuration = configuration()
@@ -70,8 +70,8 @@ public static Facade testoryFacade() {
         .mockNamer(uniqueNamer(history))
         .mockMaker(mockMaker)
         .injector(injector(singletonArray(chain(randomPrimitiveMaker(), finalMaker(), mockMaker))))
-        .wildcardSupport(wildcardSupport)
-        .verifier(verifier(proxer, overrider, pageFormatter, wildcardSupport, history))
+        .wildcarder(wildcarder)
+        .verifier(verifier(proxer, overrider, pageFormatter, wildcarder, history))
         .validate();
 
     return checking(checker, proxer, purging(history, proxer, configurableFacade(configuration)));

main/java/org/testory/plumbing/Checker.java

@@ -7,19 +7,20 @@
 import org.testory.common.Matchers;
 import org.testory.plumbing.history.FilteredHistory;
 import org.testory.plumbing.history.History;
+import org.testory.plumbing.mock.Mocked;
 
 public class Checker {
-  private final FilteredHistory<Mocking> mockingHistory;
+  private final FilteredHistory<Mocked> mockedHistory;
   private final FilteredHistory<Inspecting> inspectingHistory;
   private final Constructor<? extends RuntimeException> constructorString;
   private final Constructor<? extends RuntimeException> constructorThrowable;
 
   private Checker(
-      FilteredHistory<Mocking> mockingHistory,
+      FilteredHistory<Mocked> mockedHistory,
       FilteredHistory<Inspecting> inspectingHistory,
       Constructor<? extends RuntimeException> constructorString,
       Constructor<? extends RuntimeException> constructorThrowable) {
-    this.mockingHistory = mockingHistory;
+    this.mockedHistory = mockedHistory;
     this.inspectingHistory = inspectingHistory;
     this.constructorString = constructorString;
     this.constructorThrowable = constructorThrowable;
@@ -28,7 +29,7 @@ private Checker(
   public static Checker checker(History history, Class<? extends RuntimeException> exceptionType) {
     try {
       return new Checker(
-          filter(Mocking.class, history),
+          filter(Mocked.class, history),
           filter(Inspecting.class, history),
           exceptionType.getConstructor(String.class),
           exceptionType.getConstructor(Throwable.class));
@@ -52,8 +53,8 @@ public void matcher(Object matcher) {
 
   public void mock(Object mock) {
     notNull(mock);
-    for (Mocking mocking : mockingHistory.get()) {
-      if (mocking.mock == mock) {
+    for (Mocked mocked : mockedHistory.get()) {
+      if (mocked.mock == mock) {
         return;
       }
     }

main/java/org/testory/plumbing/facade/ConfigurableFacade.java

@@ -14,10 +14,10 @@
 import static org.testory.common.Throwables.printStackTrace;
 import static org.testory.plumbing.Inspecting.inspecting;
 import static org.testory.plumbing.PlumbingException.check;
-import static org.testory.plumbing.Stubbing.stubbing;
 import static org.testory.plumbing.format.Body.body;
 import static org.testory.plumbing.format.Header.header;
 import static org.testory.plumbing.history.FilteredHistory.filter;
+import static org.testory.plumbing.mock.Stubbed.stubbed;
 import static org.testory.proxy.Invocation.invocation;
 import static org.testory.proxy.handler.ReturningHandler.returning;
 import static org.testory.proxy.handler.ThrowingHandler.throwing;
@@ -128,14 +128,14 @@ public <T> T spy(T real) {
   public <T> T given(final Handler handler, T mock) {
     return configuration.overrider.override(mock, new Handler() {
       public Object handle(Invocation invocation) {
-        configuration.history.add(stubbing(configuration.wildcardSupport.matcherize(invocation), handler));
+        configuration.history.add(stubbed(configuration.wildcarder.matcherize(invocation), handler));
         return defaultValue(invocation.method.getReturnType());
       }
     });
   }
 
   public void given(Handler handler, InvocationMatcher invocationMatcher) {
-    configuration.history.add(stubbing(invocationMatcher, handler));
+    configuration.history.add(stubbed(invocationMatcher, handler));
   }
 
   public Handler willReturn(final Object object) {
@@ -163,15 +163,15 @@ public Object handle(Invocation invocation) throws Throwable {
   }
 
   public <T> T any(Class<T> type) {
-    return (T) configuration.wildcardSupport.any(type);
+    return (T) configuration.wildcarder.any(type);
   }
 
   public <T> T any(Class<T> type, Object matcher) {
-    return (T) configuration.wildcardSupport.any(type, matcher);
+    return (T) configuration.wildcarder.any(type, matcher);
   }
 
   public <T> T anyInstanceOf(Class<T> type) {
-    return (T) configuration.wildcardSupport.anyInstanceOf(type);
+    return (T) configuration.wildcarder.anyInstanceOf(type);
   }
 
   public boolean a(boolean value) {
@@ -207,11 +207,11 @@ public double a(double value) {
   }
 
   public <T> T a(T value) {
-    return (T) configuration.wildcardSupport.a(value);
+    return (T) configuration.wildcarder.a(value);
   }
 
   public <T> T the(T value) {
-    return (T) configuration.wildcardSupport.the(value);
+    return (T) configuration.wildcarder.the(value);
   }
 
   public void the(boolean value) {

main/java/org/testory/plumbing/facade/Configuration.java

@@ -6,9 +6,9 @@
 import org.testory.plumbing.Checker;
 import org.testory.plumbing.Maker;
 import org.testory.plumbing.history.History;
-import org.testory.plumbing.im.wildcard.WildcardSupport;
 import org.testory.plumbing.inject.Injector;
 import org.testory.plumbing.mock.Namer;
+import org.testory.plumbing.wildcard.Wildcarder;
 import org.testory.proxy.extra.Overrider;
 
 @SuppressWarnings("hiding")
@@ -21,7 +21,7 @@ public class Configuration {
   public final Namer mockNamer;
   public final Maker mockMaker;
   public final Injector injector;
-  public final WildcardSupport wildcardSupport;
+  public final Wildcarder wildcarder;
   public final Facade verifier;
 
   private Configuration(
@@ -33,7 +33,7 @@ private Configuration(
       Namer mockNamer,
       Maker mockMaker,
       Injector injector,
-      WildcardSupport wildcardSupport,
+      Wildcarder wildcarder,
       Facade verifier) {
     this.history = history;
     this.checker = checker;
@@ -43,7 +43,7 @@ private Configuration(
     this.mockNamer = mockNamer;
     this.mockMaker = mockMaker;
     this.injector = injector;
-    this.wildcardSupport = wildcardSupport;
+    this.wildcarder = wildcarder;
     this.verifier = verifier;
   }
 
@@ -72,7 +72,7 @@ public Configuration history(History history) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
@@ -87,7 +87,7 @@ public Configuration checker(Checker checker) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
@@ -102,7 +102,7 @@ public Configuration pageFormatter(PageFormatter pageFormatter) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
@@ -117,7 +117,7 @@ public Configuration exception(Class<? extends RuntimeException> exception) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
@@ -132,7 +132,7 @@ public Configuration overrider(Overrider overrider) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
@@ -147,7 +147,7 @@ public Configuration mockNamer(Namer mockNamer) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
@@ -162,7 +162,7 @@ public Configuration mockMaker(Maker mockMaker) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
@@ -177,12 +177,12 @@ public Configuration injector(Injector injector) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
-  public Configuration wildcardSupport(WildcardSupport wildcardSupport) {
-    check(wildcardSupport != null);
+  public Configuration wildcarder(Wildcarder wildcarder) {
+    check(wildcarder != null);
     return new Configuration(
         history,
         checker,
@@ -192,7 +192,7 @@ public Configuration wildcardSupport(WildcardSupport wildcardSupport) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
@@ -207,7 +207,7 @@ public Configuration verifier(Facade verifier) {
         mockNamer,
         mockMaker,
         injector,
-        wildcardSupport,
+        wildcarder,
         verifier);
   }
 
@@ -220,7 +220,7 @@ public Configuration validate() {
     check(mockNamer != null);
     check(mockMaker != null);
     check(injector != null);
-    check(wildcardSupport != null);
+    check(wildcarder != null);
     check(verifier != null);
     return this;
   }

main/java/org/testory/plumbing/format/QuietFormatter.java

@@ -1,16 +1,16 @@
 package org.testory.plumbing.format;
 
 import static org.testory.plumbing.PlumbingException.check;
-import static org.testory.plumbing.Stubbing.stubbing;
 import static org.testory.plumbing.history.FilteredHistory.filter;
+import static org.testory.plumbing.mock.Stubbed.stubbed;
 
 import org.testory.common.Chain;
 import org.testory.common.Formatter;
 import org.testory.common.Nullable;
-import org.testory.plumbing.Mocking;
-import org.testory.plumbing.Stubbing;
 import org.testory.plumbing.history.FilteredHistory;
 import org.testory.plumbing.history.History;
+import org.testory.plumbing.mock.Mocked;
+import org.testory.plumbing.mock.Stubbed;
 import org.testory.proxy.Handler;
 import org.testory.proxy.Invocation;
 import org.testory.proxy.InvocationMatcher;
@@ -40,12 +40,12 @@ public String format(@Nullable Object object) {
 
   public History quiet(final History history) {
     check(history != null);
-    final Stubbing stubbingToString = stubbingToString(history);
+    final Stubbed stubbedToString = stubbedToString(history);
     return new History() {
       public Chain<Object> get() {
         return isFormatting == 0
             ? history.get()
-            : history.get().add(stubbingToString);
+            : history.get().add(stubbedToString);
       }
 
       public void add(Object event) {
@@ -62,18 +62,18 @@ public void cut(Chain<Object> tail) {
     };
   }
 
-  private static Stubbing stubbingToString(History history) {
-    final FilteredHistory<Mocking> mockingHistory = filter(Mocking.class, history);
-    return stubbing(new InvocationMatcher() {
+  private static Stubbed stubbedToString(History history) {
+    final FilteredHistory<Mocked> mockedHistory = filter(Mocked.class, history);
+    return stubbed(new InvocationMatcher() {
       public boolean matches(Invocation invocation) {
         return invocation.method.getName().equals("toString")
             && invocation.method.getParameterTypes().length == 0;
       }
     }, new Handler() {
       public Object handle(Invocation invocation) {
-        for (Mocking mocking : mockingHistory.get()) {
-          if (mocking.mock == invocation.instance) {
-            return mocking.name;
+        for (Mocked mocked : mockedHistory.get()) {
+          if (mocked.mock == invocation.instance) {
+            return mocked.name;
           }
         }
         return "unknownMock";