You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by tj...@apache.org on 2021/05/18 16:00:02 UTC
[felix-dev] 04/05: Fix test cases to tolerate both felix and equinox
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit d59927bdfefae1dee66a07d1a6b183e0e6184913
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Tue May 18 10:42:37 2021 -0500
Fix test cases to tolerate both felix and equinox
---
.../java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java | 1 +
.../test/java/org/apache/felix/scr/integration/ComponentTestBase.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java b/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
index 73e8ae6..24d0919 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
@@ -29,6 +29,7 @@ public class ComponentConcurrencyTest extends ComponentTestBase
restrictedLogging = true;
ignoredWarnings = new String[] {"FrameworkEvent: ERROR",
"FrameworkEvent ERROR",
+ "FrameworkEvent: WARNING",
"Could not get service from ref",
"Failed creating the component instance; see log for reason",
"Cannot create component instance due to failure to bind reference",
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
index 0966c5b..03471ab 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
@@ -952,7 +952,7 @@ public abstract class ComponentTestBase
{
if ( m_warnings.size() < 1024 )
{
- m_warnings.add( entry.getMessage() );
+ m_warnings.add(entry.getMessage() + entry.getError());
}
else
{