Skip to content

Commit

Permalink
Package restructure in prep for publishing to maven central
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Warren committed May 27, 2016
1 parent 281de26 commit efe3775
Show file tree
Hide file tree
Showing 32 changed files with 176 additions and 155 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.*;
```
- Optionally, you can control the number of threads used with `@Ginkgo4jConfiguration(threads = 1)`

See [ExampleTests.java](https://github.com/paulcwarren/ginkgo4j/blob/master/src/test/java/org/paulcwarren/ginkgo4j/ExampleTests.java) for a working example.
See [ExampleTests.java](https://github.com/paulcwarren/ginkgo4j/blob/master/src/test/java/com/github/paulcwarren/ginkgo4j/ExampleTests.java) for a working example.

## Getting Started with Spring

Expand Down Expand Up @@ -63,7 +63,7 @@ import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.*;
```
- Optionally, you can control the number of threads used with `@Ginkgo4jConfiguration(threads = 1)`

See [Ginkgo4jSpringApplicationTests.java](https://github.com/paulcwarren/ginkgo4j/blob/master/src/test/java/org/paulcwarren/ginkgo4j/spring/Ginkgo4jSpringApplicationTests.java) for a working example.
See [Ginkgo4jSpringApplicationTests.java](https://github.com/paulcwarren/ginkgo4j/blob/master/src/test/java/com/github/paulcwarren/ginkgo4j/spring/Ginkgo4jSpringApplicationTests.java) for a working example.

## Screenshots
### Eclipse
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.paulcwarren.ginkgo4j;
package com.github.paulcwarren.ginkgo4j;

public interface ExecutableBlock {
void invoke() throws Exception;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.paulcwarren.ginkgo4j;
package com.github.paulcwarren.ginkgo4j;

import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.paulcwarren.ginkgo4j;
package com.github.paulcwarren.ginkgo4j;

import impl.org.paulcwarren.ginkgo4j.builder.TestVisitor;
import impl.com.github.paulcwarren.ginkgo4j.builder.TestVisitor;

public class Ginkgo4jDSL {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.paulcwarren.ginkgo4j;
package com.github.paulcwarren.ginkgo4j;

import java.lang.annotation.Annotation;
import java.util.ArrayList;
Expand All @@ -15,16 +15,16 @@
import org.junit.runner.notification.RunNotifier;
import org.junit.runners.model.InitializationError;

import impl.org.paulcwarren.ginkgo4j.Spec;
import impl.org.paulcwarren.ginkgo4j.builder.TestWalker;
import impl.org.paulcwarren.ginkgo4j.chains.ExecutableChain;
import impl.org.paulcwarren.ginkgo4j.chains.ExecutableChainBuilder;
import impl.org.paulcwarren.ginkgo4j.chains.SpecsCollector;
import impl.org.paulcwarren.ginkgo4j.junit.JunitDescriptionsCollector;
import impl.org.paulcwarren.ginkgo4j.junit.JunitSpecRunnerThread;
import impl.org.paulcwarren.ginkgo4j.junit.JunitSpecSkipperThread;
import impl.org.paulcwarren.ginkgo4j.runner.SpecRunner;
import impl.org.paulcwarren.ginkgo4j.runner.SpecSkipper;
import impl.com.github.paulcwarren.ginkgo4j.Spec;
import impl.com.github.paulcwarren.ginkgo4j.builder.TestWalker;
import impl.com.github.paulcwarren.ginkgo4j.chains.ExecutableChain;
import impl.com.github.paulcwarren.ginkgo4j.chains.ExecutableChainBuilder;
import impl.com.github.paulcwarren.ginkgo4j.chains.SpecsCollector;
import impl.com.github.paulcwarren.ginkgo4j.junit.JunitDescriptionsCollector;
import impl.com.github.paulcwarren.ginkgo4j.junit.JunitSpecRunnerThread;
import impl.com.github.paulcwarren.ginkgo4j.junit.JunitSpecSkipperThread;
import impl.com.github.paulcwarren.ginkgo4j.runner.SpecRunner;
import impl.com.github.paulcwarren.ginkgo4j.runner.SpecSkipper;

public class Ginkgo4jRunner extends Runner {

Expand Down Expand Up @@ -57,7 +57,7 @@ public void run(RunNotifier notifier) {

List<ExecutableChain> chains = calculateExecutionChains(testClass);

List<impl.org.paulcwarren.ginkgo4j.runner.Runner> runners = calculateWorkerThreads(notifier, chains);
List<impl.com.github.paulcwarren.ginkgo4j.runner.Runner> runners = calculateWorkerThreads(notifier, chains);

List<Thread> workers = threadWrap(runners, notifier, descriptions);

Expand All @@ -77,11 +77,11 @@ static List<ExecutableChain> calculateExecutionChains(Class<?> testClass) {
return chains;
}

static List<impl.org.paulcwarren.ginkgo4j.runner.Runner> calculateWorkerThreads(RunNotifier notifier, List<ExecutableChain> chains) {
static List<impl.com.github.paulcwarren.ginkgo4j.runner.Runner> calculateWorkerThreads(RunNotifier notifier, List<ExecutableChain> chains) {

List<impl.org.paulcwarren.ginkgo4j.runner.Runner> skippedWorkers = new ArrayList<>();
List<impl.org.paulcwarren.ginkgo4j.runner.Runner> focusedWorkers = new ArrayList<>();
List<impl.org.paulcwarren.ginkgo4j.runner.Runner> workers = new ArrayList<>();
List<impl.com.github.paulcwarren.ginkgo4j.runner.Runner> skippedWorkers = new ArrayList<>();
List<impl.com.github.paulcwarren.ginkgo4j.runner.Runner> focusedWorkers = new ArrayList<>();
List<impl.com.github.paulcwarren.ginkgo4j.runner.Runner> workers = new ArrayList<>();

for(ExecutableChain chain : chains) {
if (chain.isFocused()) {
Expand Down Expand Up @@ -123,9 +123,9 @@ static void threadExecute(List<Thread> workers, int threads, RunNotifier notifie
}
}

static List<Thread> threadWrap(List<impl.org.paulcwarren.ginkgo4j.runner.Runner> runners, RunNotifier notifier, Map<String,Description> descriptions) {
static List<Thread> threadWrap(List<impl.com.github.paulcwarren.ginkgo4j.runner.Runner> runners, RunNotifier notifier, Map<String,Description> descriptions) {
List<Thread> workers = new ArrayList<>();
for (impl.org.paulcwarren.ginkgo4j.runner.Runner runner : runners) {
for (impl.com.github.paulcwarren.ginkgo4j.runner.Runner runner : runners) {
if (runner instanceof SpecRunner) {
Description desc = descriptions.get(runner.getChain().getId());
if (desc == null) throw new IllegalStateException(String.format("Unable to find description for '%s'", runner.getChain().getId()));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.paulcwarren.ginkgo4j;
package com.github.paulcwarren.ginkgo4j;

import java.lang.annotation.Annotation;
import java.util.HashMap;
Expand All @@ -12,9 +12,9 @@
import org.springframework.test.context.TestContextManager;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

import impl.org.paulcwarren.ginkgo4j.builder.TestWalker;
import impl.org.paulcwarren.ginkgo4j.chains.ExecutableChain;
import impl.org.paulcwarren.ginkgo4j.junit.JunitDescriptionsCollector;
import impl.com.github.paulcwarren.ginkgo4j.builder.TestWalker;
import impl.com.github.paulcwarren.ginkgo4j.chains.ExecutableChain;
import impl.com.github.paulcwarren.ginkgo4j.junit.JunitDescriptionsCollector;

public class Ginkgo4jSpringRunner extends SpringJUnit4ClassRunner {

Expand Down Expand Up @@ -65,7 +65,7 @@ public void evaluate() {
}
}

List<impl.org.paulcwarren.ginkgo4j.runner.Runner> runners = Ginkgo4jRunner.calculateWorkerThreads(notifier, chains);
List<impl.com.github.paulcwarren.ginkgo4j.runner.Runner> runners = Ginkgo4jRunner.calculateWorkerThreads(notifier, chains);

List<Thread> workers = Ginkgo4jRunner.threadWrap(runners, notifier, descriptions);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package impl.org.paulcwarren.ginkgo4j;
package impl.com.github.paulcwarren.ginkgo4j;

import org.junit.runners.model.Statement;
import org.paulcwarren.ginkgo4j.ExecutableBlock;

import com.github.paulcwarren.ginkgo4j.ExecutableBlock;

public class Spec extends Statement {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package impl.org.paulcwarren.ginkgo4j.builder;
package impl.com.github.paulcwarren.ginkgo4j.builder;

import org.paulcwarren.ginkgo4j.ExecutableBlock;
import com.github.paulcwarren.ginkgo4j.ExecutableBlock;

public interface TestVisitor {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package impl.org.paulcwarren.ginkgo4j.builder;
package impl.com.github.paulcwarren.ginkgo4j.builder;

import org.paulcwarren.ginkgo4j.ExecutableBlock;
import org.paulcwarren.ginkgo4j.Ginkgo4jDSL;
import com.github.paulcwarren.ginkgo4j.ExecutableBlock;
import com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL;

public class TestWalker implements TestVisitor {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package impl.org.paulcwarren.ginkgo4j.chains;
package impl.com.github.paulcwarren.ginkgo4j.chains;

import java.util.ArrayList;
import java.util.List;

import org.paulcwarren.ginkgo4j.ExecutableBlock;
import com.github.paulcwarren.ginkgo4j.ExecutableBlock;

public class ExecutableChain {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package impl.org.paulcwarren.ginkgo4j.chains;
package impl.com.github.paulcwarren.ginkgo4j.chains;

import org.paulcwarren.ginkgo4j.ExecutableBlock;
import com.github.paulcwarren.ginkgo4j.ExecutableBlock;

import impl.org.paulcwarren.ginkgo4j.builder.TestVisitor;
import impl.com.github.paulcwarren.ginkgo4j.builder.TestVisitor;

public class ExecutableChainBuilder implements TestVisitor {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package impl.org.paulcwarren.ginkgo4j.chains;
package impl.com.github.paulcwarren.ginkgo4j.chains;

import java.util.ArrayList;
import java.util.List;
import java.util.Stack;

import org.paulcwarren.ginkgo4j.ExecutableBlock;
import com.github.paulcwarren.ginkgo4j.ExecutableBlock;

import impl.org.paulcwarren.ginkgo4j.Spec;
import impl.org.paulcwarren.ginkgo4j.builder.TestVisitor;
import impl.com.github.paulcwarren.ginkgo4j.Spec;
import impl.com.github.paulcwarren.ginkgo4j.builder.TestVisitor;

public class SpecsCollector implements TestVisitor {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package impl.org.paulcwarren.ginkgo4j.junit;
package impl.com.github.paulcwarren.ginkgo4j.junit;

import java.lang.annotation.Annotation;
import java.util.EmptyStackException;
Expand All @@ -7,9 +7,10 @@
import java.util.Stack;

import org.junit.runner.Description;
import org.paulcwarren.ginkgo4j.ExecutableBlock;

import impl.org.paulcwarren.ginkgo4j.builder.TestVisitor;
import com.github.paulcwarren.ginkgo4j.ExecutableBlock;

import impl.com.github.paulcwarren.ginkgo4j.builder.TestVisitor;

public class JunitDescriptionsCollector implements TestVisitor {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package impl.org.paulcwarren.ginkgo4j.junit;
package impl.com.github.paulcwarren.ginkgo4j.junit;

import org.junit.internal.AssumptionViolatedException;
import org.junit.runner.Description;
import org.junit.runner.notification.Failure;
import org.junit.runner.notification.RunNotifier;

import impl.org.paulcwarren.ginkgo4j.runner.Runner;
import impl.com.github.paulcwarren.ginkgo4j.runner.Runner;

public class JunitSpecRunnerThread extends Thread {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package impl.org.paulcwarren.ginkgo4j.junit;
package impl.com.github.paulcwarren.ginkgo4j.junit;

import org.junit.runner.Description;
import org.junit.runner.notification.RunNotifier;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package impl.com.github.paulcwarren.ginkgo4j.runner;

import impl.com.github.paulcwarren.ginkgo4j.chains.ExecutableChain;

public interface Runner {
ExecutableChain getChain();
void run() throws Exception;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package impl.com.github.paulcwarren.ginkgo4j.runner;

public class RunnerUtils {

}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package impl.org.paulcwarren.ginkgo4j.runner;
package impl.com.github.paulcwarren.ginkgo4j.runner;

import org.paulcwarren.ginkgo4j.ExecutableBlock;
import com.github.paulcwarren.ginkgo4j.ExecutableBlock;

import impl.org.paulcwarren.ginkgo4j.chains.ExecutableChain;
import impl.com.github.paulcwarren.ginkgo4j.chains.ExecutableChain;

public class SpecRunner implements Runner {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package impl.org.paulcwarren.ginkgo4j.runner;
package impl.com.github.paulcwarren.ginkgo4j.runner;

import impl.org.paulcwarren.ginkgo4j.chains.ExecutableChain;
import impl.com.github.paulcwarren.ginkgo4j.chains.ExecutableChain;

public class SpecSkipper implements Runner {

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.paulcwarren.ginkgo4j;
package com.github.paulcwarren.ginkgo4j;

public class Example {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package org.paulcwarren.ginkgo4j;
package com.github.paulcwarren.ginkgo4j;

import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.AfterEach;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.BeforeEach;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.Context;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.Describe;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.It;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.AfterEach;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.BeforeEach;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.Context;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.Describe;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.It;

import org.junit.Assert;
import org.junit.Ignore;
import org.junit.runner.RunWith;

import com.github.paulcwarren.ginkgo4j.Ginkgo4jRunner;

@Ignore
@RunWith(Ginkgo4jRunner.class)
public class ExampleTests {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
package org.paulcwarren.ginkgo4j;

package com.github.paulcwarren.ginkgo4j;

import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.BeforeEach;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.Context;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.Describe;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.FContext;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.FDescribe;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.FIt;
import static com.github.paulcwarren.ginkgo4j.Ginkgo4jDSL.It;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
import static org.mockito.Mockito.mock;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.BeforeEach;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.Context;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.Describe;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.FContext;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.FDescribe;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.FIt;
import static org.paulcwarren.ginkgo4j.Ginkgo4jDSL.It;

import java.util.List;

import org.junit.runner.RunWith;
import org.junit.runner.notification.RunNotifier;

import impl.org.paulcwarren.ginkgo4j.Spec;
import impl.org.paulcwarren.ginkgo4j.chains.ExecutableChain;
import impl.org.paulcwarren.ginkgo4j.runner.Runner;
import impl.org.paulcwarren.ginkgo4j.runner.SpecRunner;
import impl.org.paulcwarren.ginkgo4j.runner.SpecSkipper;
import com.github.paulcwarren.ginkgo4j.Ginkgo4jConfiguration;
import com.github.paulcwarren.ginkgo4j.Ginkgo4jRunner;

import impl.com.github.paulcwarren.ginkgo4j.Spec;
import impl.com.github.paulcwarren.ginkgo4j.chains.ExecutableChain;
import impl.com.github.paulcwarren.ginkgo4j.runner.Runner;
import impl.com.github.paulcwarren.ginkgo4j.runner.SpecRunner;
import impl.com.github.paulcwarren.ginkgo4j.runner.SpecSkipper;

@SuppressWarnings("unchecked")
@RunWith(Ginkgo4jRunner.class)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.paulcwarren.ginkgo4j.spring;
package com.github.paulcwarren.ginkgo4j.spring;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
Loading

0 comments on commit efe3775

Please sign in to comment.