summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-05-28 23:21:15 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-05-28 23:21:15 +0000
commit674b43581d9e169ea66a527458b35b898caa46a6 (patch)
treec06bf82c26842ab36acd9766b40df426f9c5895b /branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding
parent489f4354333e244564fc279bbf554cdd44652c1d (diff)
Merge branch 'work'
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@779795 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding')
-rw-r--r--branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
index 547bfe058a..c3666f1916 100644
--- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
@@ -55,8 +55,8 @@ public class AggregatorTestCase {
new Socket("127.0.0.1", 8085);
}
- @Ignore("TUSCANY-2939")
- //@Test
+ //@Ignore("TUSCANY-2939")
+ @Test
public void testAggregator() throws Exception {
Entry<String, Item>[] entries = aggregatorService.getAll();