commit b405e97339b4ad8a01d0f739b280d6594c6541b8
Author: Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Sun, 1 Dec 2013 11:54:02 +0100
Commit: Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sun, 1 Dec 2013 15:04:50 +0100
JBEHAVE-958: Updated jbehave-rest example to use new specific Redmine demo
project. Ensured rest and core modules use the same xstream dependency.
diff --git a/examples/rest/README.md b/examples/rest/README.md
new file mode 100644
index 0000000..81f222d
--- /dev/null
+++ b/examples/rest/README.md
@@ -0,0 +1,5 @@
+The REST example uses Redmine Demo wiki at
http://demo.redmine.org/projects/jbehave-rest/wiki
+
+Username/password: jbehave/jbehave
+Email: dev@jbehave.codehaus.org
+
diff --git
a/examples/rest/src/main/java/org/jbehave/examples/core/rest/steps/RESTSteps.java
b/examples/rest/src/main/java/org/jbehave/examples/core/rest/steps/RESTSteps.java
index 06d941c..677b573 100644
---
a/examples/rest/src/main/java/org/jbehave/examples/core/rest/steps/RESTSteps.java
+++
b/examples/rest/src/main/java/org/jbehave/examples/core/rest/steps/RESTSteps.java
@@ -16,7 +16,7 @@ import org.jbehave.core.io.rest.redmine.UploadToRedmine;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
public class RESTSteps {
@@ -29,9 +29,9 @@ public class RESTSteps {
index = indexer.indexResources(uri);
}
- @Then("the index contains $number stories")
- public void indexContainsStories(int number){
- assertThat(index.size(), equalTo(number));
+ @Then("the index is not empty")
+ public void indexContainsStories(){
+ assertThat(index.size(), greaterThan(0));
}
@When("story $name is loaded from Redmine")
@@ -47,7 +47,7 @@ public class RESTSteps {
@When("story $name is uploaded to Redmine")
public void storyIsUploadedToRedmine(String name){
- ResourceUploader uploader = new UploadToRedmine(Type.JSON);
+ ResourceUploader uploader = new UploadToRedmine(Type.JSON, "jbehave",
"jbehave");
uploader.uploadResourceAsText(index.get(name).getURI(), text);
}
diff --git
a/examples/rest/src/main/java/org/jbehave/examples/core/rest/stories/redmine.story
b/examples/rest/src/main/java/org/jbehave/examples/core/rest/stories/redmine.story
index 45b5097..6a67062 100644
---
a/examples/rest/src/main/java/org/jbehave/examples/core/rest/stories/redmine.story
+++
b/examples/rest/src/main/java/org/jbehave/examples/core/rest/stories/redmine.story
@@ -1,7 +1,7 @@
Scenario: Story index is retrieved from Redmine
-When index is retrieved from Redmine at
http://demo.redmine.org/projects/jbehave/wiki
-Then the index contains 2 stories
+When index is retrieved from Redmine at
http://demo.redmine.org/projects/jbehave-rest/wiki
+Then the index is not empty
Scenario: Story is loaded from Redmine
diff --git a/jbehave-core/pom.xml b/jbehave-core/pom.xml
index 62c41ce..d85ae5d 100755
--- a/jbehave-core/pom.xml
+++ b/jbehave-core/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
diff --git a/jbehave-rest/pom.xml b/jbehave-rest/pom.xml
index bc15821..ed5982a 100644
--- a/jbehave-rest/pom.xml
+++ b/jbehave-rest/pom.xml
@@ -27,11 +27,6 @@
<artifactId>gson</artifactId>
<version>2.2.4</version>
</dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.5</version>
- </dependency>
</dependencies>
</project>
