Author: dkulp
Date: Fri Dec 13 20:31:53 2013
New Revision: 1550835
URL: http://svn.apache.org/r1550835
Log:
Fix some test failures
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java?rev=1550835&r1=1550834&r2=1550835&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
Fri Dec 13 20:31:53 2013
@@ -73,6 +73,8 @@ public class Helper {
mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.jexl.evaluator"),
+ ((startBlueprint) ?
mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api") :
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api").noStart()),
((startBlueprint) ?
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api") :
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api").noStart()),
((startBlueprint) ?
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core") :
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java?rev=1550835&r1=1550834&r2=1550835&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
Fri Dec 13 20:31:53 2013
@@ -129,7 +129,7 @@ public class QuiesceBlueprintTest extend
if (obj != null)
{
- QuiesceParticipant participant =
getParticipant("org.apache.aries.blueprint");
+ QuiesceParticipant participant =
getParticipant("org.apache.aries.blueprint.core");
if (participant != null)
{
@@ -188,7 +188,7 @@ public class QuiesceBlueprintTest extend
if (obj != null)
{
- QuiesceParticipant participant =
getParticipant("org.apache.aries.blueprint");
+ QuiesceParticipant participant =
getParticipant("org.apache.aries.blueprint.core");
if (participant != null)
{
@@ -249,7 +249,7 @@ public class QuiesceBlueprintTest extend
if (obj != null)
{
- QuiesceParticipant participant =
getParticipant("org.apache.aries.blueprint");
+ QuiesceParticipant participant =
getParticipant("org.apache.aries.blueprint.core");
if (participant != null)
{
@@ -306,7 +306,7 @@ public class QuiesceBlueprintTest extend
if (obj != null)
{
- QuiesceParticipant participant =
getParticipant("org.apache.aries.blueprint");
+ QuiesceParticipant participant =
getParticipant("org.apache.aries.blueprint.core");
if (participant != null)
{
