Rename junit test package to junit4

.gitignore

@@ -1,6 +1,7 @@
 *.orig
 *.iws
 .idea/workspace.xml
+.ant-targets-build.xml
 out
 build/artifacts
 lib/build

README.md

@@ -15,14 +15,14 @@ Alternative tools:
 Currently this library supports several features:
   * Generate [HTML](https://github.com/bodar/yatspec/raw/wiki/example.html) based on a [JUnit Java](/test/com/googlecode/yatspec/junit/SpecificationExampleTest.java) file
   * BDD "Given / When / Then" support with automatic capturing and display of "givens" and captured inputs and output.
-  * Tabular data tests by using [@TableRunner](src/com/googlecode/yatspec/junit/TableRunner.java) 
-  with [@Table](src/com/googlecode/yatspec/junit/Table.java) and [@Row](src/com/googlecode/yatspec/junit/Row.java) support for JUnit Methods (similar to in MBUnit / NUnit)
-  * [@Notes](src/com/googlecode/yatspec/junit/Notes.java) to add comments to tests
-  * [@LinkingNote](/src/com/googlecode/yatspec/junit/LinkingNote.java) to [generate links between tests](https://www.youtube.com/watch?v=CFMkD-t363c)  
+  * Tabular data tests by using [@TableRunner](src/com/googlecode/yatspec/junit4/TableRunner.java) 
+  with [@Table](src/com/googlecode/yatspec/junit4/Table.java) and [@Row](src/com/googlecode/yatspec/junit4/Row.java) support for JUnit Methods (similar to in MBUnit / NUnit)
+  * [@Notes](src/com/googlecode/yatspec/junit4/Notes.java) to add comments to tests
+  * [@LinkingNote](/com/googlecode/yatspec/junit4/LinkingNote.java) to [generate links between tests](https://www.youtube.com/watch?v=CFMkD-t363c)  
 
 ### Quick Start ###
 
-The simplest example would be to add the JUnit [@RunWith](http://junit.sourceforge.net/javadoc/org/junit/runner/RunWith.html) attribute specifying the [SpecRunner](/src/com/googlecode/yatspec/junit/SpecRunner.java) class to your Test class.
+The simplest example would be to add the JUnit [@RunWith](http://junit.sourceforge.net/javadoc/org/junit/runner/RunWith.html) attribute specifying the [SpecRunner](/com/googlecode/yatspec/junit4/SpecRunner.java) class to your Test class.
 
 ```java
 @RunWith(SpecRunner.class)

src/com/googlecode/yatspec/junit/DecoratingFrameworkMethod.java → src/com/googlecode/yatspec/junit4/DecoratingFrameworkMethod.java

@@ -1,10 +1,10 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.yatspec.rendering.ScenarioNameRendererFactory;
 import com.googlecode.yatspec.state.ScenarioName;
 import org.junit.runners.model.FrameworkMethod;
 
-import static com.googlecode.yatspec.junit.ParameterResolverFactory.parameterResolver;
+import static com.googlecode.yatspec.junit4.ParameterResolverFactory.parameterResolver;
 import static java.util.Arrays.asList;
 
 public class DecoratingFrameworkMethod extends FrameworkMethod {

src/com/googlecode/yatspec/junit/DefaultResultListeners.java → src/com/googlecode/yatspec/junit4/DefaultResultListeners.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.totallylazy.Option;
 import com.googlecode.yatspec.rendering.html.HtmlResultRenderer;

src/com/googlecode/yatspec/junit/LinkingNote.java → src/com/googlecode/yatspec/junit4/LinkingNote.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/com/googlecode/yatspec/junit/Notes.java → src/com/googlecode/yatspec/junit4/Notes.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.totallylazy.Option;
 import com.googlecode.totallylazy.Sequences;

src/com/googlecode/yatspec/junit/ParameterResolver.java → src/com/googlecode/yatspec/junit4/ParameterResolver.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import java.lang.reflect.Method;
 

src/com/googlecode/yatspec/junit/ParameterResolverFactory.java → src/com/googlecode/yatspec/junit4/ParameterResolverFactory.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import static com.googlecode.yatspec.Creator.create;
 import static java.lang.Class.forName;

src/com/googlecode/yatspec/junit/Row.java → src/com/googlecode/yatspec/junit4/Row.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/com/googlecode/yatspec/junit/SpecResultListener.java → src/com/googlecode/yatspec/junit4/SpecResultListener.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.yatspec.state.Result;
 

src/com/googlecode/yatspec/junit/SpecRunner.java → src/com/googlecode/yatspec/junit4/SpecRunner.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.totallylazy.Predicate;
 import com.googlecode.yatspec.state.Result;

src/com/googlecode/yatspec/junit/Table.java → src/com/googlecode/yatspec/junit4/Table.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/com/googlecode/yatspec/junit/TableRunner.java → src/com/googlecode/yatspec/junit4/TableRunner.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.totallylazy.Callable1;
 import com.googlecode.totallylazy.Predicate;

src/com/googlecode/yatspec/junit/VarargsParameterResolver.java → src/com/googlecode/yatspec/junit4/VarargsParameterResolver.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;

src/com/googlecode/yatspec/junit/WithCustomResultListeners.java → src/com/googlecode/yatspec/junit4/WithCustomResultListeners.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 public interface WithCustomResultListeners {
     Iterable<SpecResultListener> getResultListeners() throws Exception;

src/com/googlecode/yatspec/junit/YatspecAnnotation.java → src/com/googlecode/yatspec/junit4/YatspecAnnotation.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.totallylazy.predicates.LogicalPredicate;
 

src/com/googlecode/yatspec/parsing/TestMethodExtractor.java

@@ -3,7 +3,7 @@
 import com.googlecode.totallylazy.Callable1;
 import com.googlecode.totallylazy.Sequence;
 import com.googlecode.totallylazy.Strings;
-import com.googlecode.yatspec.junit.Table;
+import com.googlecode.yatspec.junit4.Table;
 import com.googlecode.yatspec.state.ScenarioTable;
 import com.googlecode.yatspec.state.TestMethod;
 import com.thoughtworks.qdox.model.*;

src/com/googlecode/yatspec/rendering/FileRenderer.java

@@ -1,7 +1,7 @@
 package com.googlecode.yatspec.rendering;
 
 import com.googlecode.totallylazy.Files;
-import com.googlecode.yatspec.junit.SpecResultListener;
+import com.googlecode.yatspec.junit4.SpecResultListener;
 import com.googlecode.yatspec.state.Result;
 
 import java.io.File;

src/com/googlecode/yatspec/rendering/LinkingNoteRenderer.java

@@ -1,8 +1,7 @@
 package com.googlecode.yatspec.rendering;
 
 import com.googlecode.totallylazy.Callable1;
-import com.googlecode.yatspec.junit.LinkingNote;
-import com.googlecode.yatspec.rendering.Renderer;
+import com.googlecode.yatspec.junit4.LinkingNote;
 
 import java.io.File;
 

src/com/googlecode/yatspec/rendering/NotesRenderer.java

@@ -1,6 +1,6 @@
 package com.googlecode.yatspec.rendering;
 
-import com.googlecode.yatspec.junit.Notes;
+import com.googlecode.yatspec.junit4.Notes;
 
 public class NotesRenderer implements Renderer<Notes>{
     @Override

src/com/googlecode/yatspec/rendering/ScenarioNameRendererFactory.java

@@ -1,8 +1,6 @@
 package com.googlecode.yatspec.rendering;
 
-import com.googlecode.yatspec.junit.SpecRunner;
 import com.googlecode.yatspec.rendering.junit.HumanReadableScenarioNameRenderer;
-import com.googlecode.yatspec.state.ScenarioName;
 
 import static com.googlecode.yatspec.Creator.create;
 import static java.lang.Class.forName;

src/com/googlecode/yatspec/rendering/html/HtmlResultRenderer.java

@@ -6,9 +6,9 @@
 import com.googlecode.totallylazy.Predicate;
 import com.googlecode.totallylazy.Xml;
 import com.googlecode.yatspec.Creator;
-import com.googlecode.yatspec.junit.LinkingNote;
-import com.googlecode.yatspec.junit.Notes;
-import com.googlecode.yatspec.junit.SpecResultListener;
+import com.googlecode.yatspec.junit4.LinkingNote;
+import com.googlecode.yatspec.junit4.Notes;
+import com.googlecode.yatspec.junit4.SpecResultListener;
 import com.googlecode.yatspec.parsing.Files;
 import com.googlecode.yatspec.parsing.JavaSource;
 import com.googlecode.yatspec.rendering.*;

src/com/googlecode/yatspec/rendering/html/index/HtmlIndexRenderer.java

@@ -1,7 +1,7 @@
 package com.googlecode.yatspec.rendering.html.index;
 
 import com.googlecode.funclate.stringtemplate.EnhancedStringTemplateGroup;
-import com.googlecode.yatspec.junit.SpecResultListener;
+import com.googlecode.yatspec.junit4.SpecResultListener;
 import com.googlecode.yatspec.rendering.Content;
 import com.googlecode.yatspec.rendering.ContentAtUrl;
 import com.googlecode.yatspec.rendering.Index;

src/com/googlecode/yatspec/rendering/html/tagindex/HtmlTagIndexRenderer.java

@@ -6,7 +6,7 @@
 import com.googlecode.totallylazy.Group;
 import com.googlecode.totallylazy.Pair;
 import com.googlecode.totallylazy.Sequence;
-import com.googlecode.yatspec.junit.SpecResultListener;
+import com.googlecode.yatspec.junit4.SpecResultListener;
 import com.googlecode.yatspec.rendering.Index;
 import com.googlecode.yatspec.rendering.html.HtmlResultRenderer;
 import com.googlecode.yatspec.state.Result;

src/com/googlecode/yatspec/rendering/html/tagindex/NotesTagFinder.java

@@ -3,13 +3,13 @@
 import com.googlecode.totallylazy.Function1;
 import com.googlecode.totallylazy.Sequences;
 import com.googlecode.totallylazy.regex.Regex;
-import com.googlecode.yatspec.junit.Notes;
+import com.googlecode.yatspec.junit4.Notes;
 import com.googlecode.yatspec.state.TestMethod;
 
 import java.util.regex.MatchResult;
 
 import static com.googlecode.totallylazy.regex.Regex.regex;
-import static com.googlecode.yatspec.junit.Notes.methods.notes;
+import static com.googlecode.yatspec.junit4.Notes.methods.notes;
 
 public class NotesTagFinder implements TagFinder {
     private Regex regex;

src/com/googlecode/yatspec/rendering/wiki/WikiResultRenderer.java

@@ -4,8 +4,8 @@
 import com.googlecode.totallylazy.Callable1;
 import com.googlecode.totallylazy.Pair;
 import com.googlecode.totallylazy.Predicate;
-import com.googlecode.yatspec.junit.Notes;
-import com.googlecode.yatspec.junit.SpecResultListener;
+import com.googlecode.yatspec.junit4.Notes;
+import com.googlecode.yatspec.junit4.SpecResultListener;
 import com.googlecode.yatspec.parsing.Files;
 import com.googlecode.yatspec.parsing.JavaSource;
 import com.googlecode.yatspec.rendering.NotesRenderer;
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.googlecode.totallylazy.Callables.asString;
 import static com.googlecode.totallylazy.Maps.entries;
 import static com.googlecode.totallylazy.Predicates.*;
 import static com.googlecode.totallylazy.Sequences.sequence;

src/com/googlecode/yatspec/state/TestMethod.java

@@ -15,7 +15,7 @@
 import java.util.Map;
 
 import static com.googlecode.totallylazy.Sequences.sequence;
-import static com.googlecode.yatspec.junit.YatspecAnnotation.methods.yatspecAnnotations;
+import static com.googlecode.yatspec.junit4.YatspecAnnotation.methods.yatspecAnnotations;
 import static java.lang.System.lineSeparator;
 
 @SuppressWarnings({"unused"})

src/com/googlecode/yatspec/state/TestResult.java

@@ -7,7 +7,7 @@
 import java.util.List;
 
 import static com.googlecode.totallylazy.Sequences.sequence;
-import static com.googlecode.yatspec.junit.YatspecAnnotation.methods.yatspecAnnotations;
+import static com.googlecode.yatspec.junit4.YatspecAnnotation.methods.yatspecAnnotations;
 import static com.googlecode.yatspec.parsing.Text.wordify;
 import static java.util.Arrays.asList;
 

test/com/googlecode/yatspec/junit/AbstractTestCase.java → test/com/googlecode/yatspec/junit4/AbstractTestCase.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.yatspec.state.givenwhenthen.TestState;
 import org.junit.Test;

test/com/googlecode/yatspec/junit/BeforeClassTest.java → test/com/googlecode/yatspec/junit4/BeforeClassTest.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.yatspec.state.givenwhenthen.TestState;
 import org.junit.BeforeClass;

test/com/googlecode/yatspec/junit/ChildClassTest.java → test/com/googlecode/yatspec/junit4/ChildClassTest.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 public class ChildClassTest extends AbstractTestCase {
 }

test/com/googlecode/yatspec/junit/DecoratingFrameworkMethodTest.java → test/com/googlecode/yatspec/junit4/DecoratingFrameworkMethodTest.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.yatspec.rendering.junit.HumanReadableScenarioNameRenderer;
 import com.googlecode.yatspec.rendering.junit.MavenSurefireScenarioNameRenderer;

test/com/googlecode/yatspec/junit/DecoratingFrameworkMethodVarargsTest.java → test/com/googlecode/yatspec/junit4/DecoratingFrameworkMethodVarargsTest.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.totallylazy.Mapper;
 import com.googlecode.totallylazy.Predicates;
@@ -12,7 +12,7 @@
 import java.util.Map;
 
 import static com.googlecode.totallylazy.Sequences.sequence;
-import static com.googlecode.yatspec.junit.DecoratingFrameworkMethodTest.row;
+import static com.googlecode.yatspec.junit4.DecoratingFrameworkMethodTest.row;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.is;

test/com/googlecode/yatspec/junit/LinkingNoteRendererTest.java → test/com/googlecode/yatspec/junit4/LinkingNoteRendererTest.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.yatspec.rendering.LinkingNoteRenderer;
 import com.googlecode.yatspec.state.TestMethod;

test/com/googlecode/yatspec/junit/SequenceDiagramingExampleTest.java → test/com/googlecode/yatspec/junit4/SequenceDiagramingExampleTest.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.totallylazy.Sequence;
 import com.googlecode.yatspec.plugin.sequencediagram.ByNamingConventionMessageProducer;

test/com/googlecode/yatspec/junit/SpecRunnerTest.java → test/com/googlecode/yatspec/junit4/SpecRunnerTest.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.totallylazy.StringPrintStream;
 import org.junit.After;

test/com/googlecode/yatspec/junit/SpecificationExampleTest.java → test/com/googlecode/yatspec/junit4/SpecificationExampleTest.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import com.googlecode.yatspec.rendering.NotesRenderer;
 import com.googlecode.yatspec.rendering.html.HtmlResultRenderer;

test/com/googlecode/yatspec/junit/TableExampleTest.java → test/com/googlecode/yatspec/junit4/TableExampleTest.java

@@ -1,4 +1,4 @@
-package com.googlecode.yatspec.junit;
+package com.googlecode.yatspec.junit4;
 
 import org.hamcrest.Matcher;
 import org.junit.Test;

test/com/googlecode/yatspec/parsing/TestParserTest.java

@@ -1,9 +1,9 @@
 package com.googlecode.yatspec.parsing;
 
-import com.googlecode.yatspec.junit.Notes;
-import com.googlecode.yatspec.junit.Row;
-import com.googlecode.yatspec.junit.SpecRunner;
-import com.googlecode.yatspec.junit.Table;
+import com.googlecode.yatspec.junit4.Notes;
+import com.googlecode.yatspec.junit4.Row;
+import com.googlecode.yatspec.junit4.SpecRunner;
+import com.googlecode.yatspec.junit4.Table;
 import com.googlecode.yatspec.state.TestMethod;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -12,7 +12,7 @@
 import java.util.Locale;
 
 import static com.googlecode.totallylazy.Sequences.sequence;
-import static com.googlecode.yatspec.junit.Notes.methods.notes;
+import static com.googlecode.yatspec.junit4.Notes.methods.notes;
 import static com.googlecode.yatspec.parsing.TestParser.parseTestMethods;
 import static java.lang.String.format;
 import static org.hamcrest.MatcherAssert.assertThat;

test/com/googlecode/yatspec/plugin/dictionary/ExampleDictionaryTest.java

@@ -1,8 +1,8 @@
 package com.googlecode.yatspec.plugin.dictionary;
 
-import com.googlecode.yatspec.junit.SpecResultListener;
-import com.googlecode.yatspec.junit.SpecRunner;
-import com.googlecode.yatspec.junit.WithCustomResultListeners;
+import com.googlecode.yatspec.junit4.SpecResultListener;
+import com.googlecode.yatspec.junit4.SpecRunner;
+import com.googlecode.yatspec.junit4.WithCustomResultListeners;
 import com.googlecode.yatspec.rendering.html.HtmlResultRenderer;
 import org.junit.Test;
 import org.junit.runner.RunWith;

test/com/googlecode/yatspec/rendering/Annotations.java

@@ -1,6 +1,6 @@
 package com.googlecode.yatspec.rendering;
 
-import com.googlecode.yatspec.junit.Notes;
+import com.googlecode.yatspec.junit4.Notes;
 
 public class Annotations {
     private Annotations() {

test/com/googlecode/yatspec/state/TestResultTest.java

@@ -1,10 +1,10 @@
 package com.googlecode.yatspec.state;
 
-import com.googlecode.yatspec.junit.Notes;
+import com.googlecode.yatspec.junit4.Notes;
 import org.junit.Test;
 
 import static com.googlecode.totallylazy.Sequences.sequence;
-import static com.googlecode.yatspec.junit.Notes.methods.notes;
+import static com.googlecode.yatspec.junit4.Notes.methods.notes;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;