You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/09/24 15:39:51 UTC
[1/2] camel git commit: Skip tests that do not work
Repository: camel
Updated Branches:
refs/heads/master 258fa3adb -> 92c4a815b
Skip tests that do not work
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21b72c0a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21b72c0a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21b72c0a
Branch: refs/heads/master
Commit: 21b72c0adcfbf34dbc1cedddd6f0ae2f58ccc161
Parents: 258fa3a
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Sep 24 15:37:51 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Sep 24 15:37:51 2015 +0200
----------------------------------------------------------------------
.../camel/component/yammer/YammerMultipleUsersRouteTest.java | 3 ++-
.../camel/component/yammer/YammerUserPollEnrichRouteTest.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/21b72c0a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
index ca45d22..b298be3 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.camel.component.yammer;
-
import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.yammer.model.User;
+import org.junit.Ignore;
import org.junit.Test;
+@Ignore("Online access to yammer and fails with 401 authentication error")
public class YammerMultipleUsersRouteTest extends YammerComponentTestSupport {
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/camel/blob/21b72c0a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
index 39acea6..e009a1c 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
@@ -16,13 +16,14 @@
*/
package org.apache.camel.component.yammer;
-
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.yammer.model.User;
+import org.junit.Ignore;
import org.junit.Test;
+@Ignore("Online access to yammer and fails with 401 authentication error")
public class YammerUserPollEnrichRouteTest extends YammerComponentTestSupport {
@Test
[2/2] camel git commit: No need for sync in that guice unit test as
reported by some code scanner tools.
Posted by da...@apache.org.
No need for sync in that guice unit test as reported by some code scanner tools.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/92c4a815
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/92c4a815
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/92c4a815
Branch: refs/heads/master
Commit: 92c4a815b273e8d76dc3da539aa766a397fd02d5
Parents: 21b72c0
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Sep 24 15:41:20 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Sep 24 15:41:20 2015 +0200
----------------------------------------------------------------------
.../apache/camel/guice/testing/InjectorManager.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/92c4a815/components/camel-guice/src/test/java/org/apache/camel/guice/testing/InjectorManager.java
----------------------------------------------------------------------
diff --git a/components/camel-guice/src/test/java/org/apache/camel/guice/testing/InjectorManager.java b/components/camel-guice/src/test/java/org/apache/camel/guice/testing/InjectorManager.java
index a01a5d3..25d0129 100644
--- a/components/camel-guice/src/test/java/org/apache/camel/guice/testing/InjectorManager.java
+++ b/components/camel-guice/src/test/java/org/apache/camel/guice/testing/InjectorManager.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.guice.testing;
+
import java.lang.reflect.Modifier;
import java.util.Map;
import java.util.Map.Entry;
@@ -36,7 +37,6 @@ import org.apache.camel.guice.util.CloseableScope;
/**
* Used to manage the injectors for the various injection points
- *
*/
public class InjectorManager {
private static final String NESTED_MODULE_CLASS = "TestModule";
@@ -97,14 +97,11 @@ public class InjectorManager {
Class<? extends Object> testType = test.getClass();
moduleType = getModuleForTestClass(testType);
- Injector classInjector;
- synchronized (injectors) {
- classInjector = injectors.get(moduleType);
- if (classInjector == null) {
- classInjector = createInjector(moduleType);
- Preconditions.checkNotNull(classInjector, "classInjector");
- injectors.put(moduleType, classInjector);
- }
+ Injector classInjector = injectors.get(moduleType);
+ if (classInjector == null) {
+ classInjector = createInjector(moduleType);
+ Preconditions.checkNotNull(classInjector, "classInjector");
+ injectors.put(moduleType, classInjector);
}
injectors.put(testType, classInjector);
@@ -147,7 +144,6 @@ public class InjectorManager {
CloseErrors errors = new CloseErrorsImpl(this);
Set<Entry<Object, Injector>> entries = injectors.entrySet();
for (Entry<Object, Injector> entry : entries) {
- // Object key = entry.getKey();
Injector injector = entry.getValue();
Injectors.close(injector, errors);
}