Skip to content

Commit

Permalink
Updated versions
Browse files Browse the repository at this point in the history
  • Loading branch information
wakaleo committed Jun 29, 2014
1 parent e15e1d5 commit 1dacbee
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 21 deletions.
17 changes: 8 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
<version>0.9.250</version>
<version>0.9.255</version>
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-jbehave-plugin</artifactId>
<version>0.9.251-SNAPSHOT</version>
<version>0.9.255-SNAPSHOT</version>
<name>thucydides-jbehave-plugin</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jbehave.core.version>3.9.2</jbehave.core.version>
<jbehave.core.version>3.9.3</jbehave.core.version>
<embeddables>**/*Stories.java</embeddables>
</properties>
<scm>
Expand Down Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-core</artifactId>
<version>0.9.250</version>
<version>0.9.255</version>
</dependency>
<dependency>
<groupId>org.jbehave</groupId>
Expand All @@ -53,7 +53,7 @@
<dependency>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-test-utils</artifactId>
<version>0.9.250</version>
<version>0.9.255</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -91,7 +91,7 @@
<dependency>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-sample-alternative-resources</artifactId>
<version>0.9.131-NS</version>
<version>0.9.255</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -120,9 +120,8 @@
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.2.1</version>
<!--<scope>test</scope>-->
<artifactId>groovy</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</project>
12 changes: 1 addition & 11 deletions src/main/java/net/thucydides/jbehave/ClassFinder.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ private List<Class<?>> allClassesInPackage(String packageName) {
List<File> dirs = new ArrayList<File>();
while (resources.hasMoreElements()) {
URL resource = resources.nextElement();
dirs.add(urlToFile(resource));
dirs.add(new File(resource.getFile()));
}
List<Class<?>> classes = Lists.newArrayList();
for (File directory : dirs) {
Expand All @@ -74,16 +74,6 @@ private List<Class<?>> allClassesInPackage(String packageName) {
return classes;
}

private File urlToFile(final URL url) {
try {
return new File(
url.toURI()
);
} catch (final Exception e) {
throw new RuntimeException("failed to convert URL [" + url + "] to File", e);
}
}


private List<Class<? extends Annotation>> expectedAnnotations;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package net.thucydides.jbehave;

import net.thucydides.core.util.EnvironmentVariables;

public class AStoryInTheStoriesDirectory extends ThucydidesJUnitStory {
public AStoryInTheStoriesDirectory() {
}

public AStoryInTheStoriesDirectory(EnvironmentVariables environmentVariables) {
super(environmentVariables);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void should_find_stories_in_a_jar_file() throws Throwable {
public void should_find_stories_in_a_subdirectory_in_the_jar_file() throws Throwable {

// Given
ThucydidesJUnitStories story = newStory("a_story_in_the_stories_directory.story");
ThucydidesJUnitStories story = newStory("annotatedstories/a_story_in_the_stories_directory.story");

// When
run(story);
Expand Down

0 comments on commit 1dacbee

Please sign in to comment.