Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.mylyn.tests.util/src/org')
-rw-r--r--org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java28
1 files changed, 18 insertions, 10 deletions
diff --git a/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java b/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java
index f1f407ab4..4b2bb0252 100644
--- a/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java
+++ b/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java
@@ -95,12 +95,14 @@ public abstract class TestFixture {
private final String connectorKind;
- private String info;
+ private String simpleInfo;
protected final String repositoryUrl;
private TestSuite suite;
+ private String repositoryName;
+
public TestFixture(String connectorKind, String repositoryUrl) {
this.connectorKind = connectorKind;
this.repositoryUrl = repositoryUrl;
@@ -112,11 +114,7 @@ public abstract class TestFixture {
public void add(Class<? extends TestCase> clazz) {
Assert.isNotNull(suite, "Invoke createSuite() first");
- if (Boolean.parseBoolean(System.getProperty("mylyn.tests.annotate")) && getInfo() != null) {
- suite.addTest(new TestSuite(clazz, clazz.getName() + " [@" + getInfo() + "]"));
- } else {
- suite.addTestSuite(clazz);
- }
+ suite.addTestSuite(clazz);
}
public AbstractRepositoryConnector connector() {
@@ -126,7 +124,7 @@ public abstract class TestFixture {
public TestSuite createSuite(TestSuite parentSuite) {
suite = new TestSuite("Testing on " + getInfo());
parentSuite.addTest(suite);
- suite.addTest(new Activation("repository: " + getRepositoryUrl() + " [@" + getInfo() + "]", true));
+ suite.addTest(new Activation("repository: " + getRepositoryUrl() + " [@" + getSimpleInfo() + "]", true));
return suite;
}
@@ -141,13 +139,17 @@ public abstract class TestFixture {
}
public String getInfo() {
- return info;
+ return repositoryName + " " + simpleInfo;
}
public String getRepositoryUrl() {
return repositoryUrl;
}
+ public String getSimpleInfo() {
+ return simpleInfo;
+ }
+
public AbstractWebLocation location() throws Exception {
return location(PrivilegeLevel.USER);
}
@@ -181,8 +183,14 @@ public abstract class TestFixture {
return repository;
}
- protected void setInfo(String info) {
- this.info = info;
+ protected void setInfo(String repositoryName, String version, String description) {
+ Assert.isNotNull(repositoryName);
+ Assert.isNotNull(version);
+ this.repositoryName = repositoryName;
+ this.simpleInfo = version;
+ if (description != null && description.length() > 0) {
+ this.simpleInfo += "/" + description;
+ }
}
public TaskRepository singleRepository() {

Back to the top