You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2015/11/25 13:32:56 UTC
svn commit: r1716372 - in /aries/trunk/blueprint:
blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/
blueprint-testbundles/
blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/
Author: gnodet
Date: Wed Nov 25 12:32:56 2015
New Revision: 1716372
URL: http://svn.apache.org/viewvc?rev=1716372&view=rev
Log:
[ARIES-1456] Test AOP weaving for spring beans
Added:
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanCItf.java
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java
aries/trunk/blueprint/blueprint-testbundles/pom.xml
aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanC.java
Modified: aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java?rev=1716372&r1=1716371&r2=1716372&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java (original)
+++ aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java Wed Nov 25 12:32:56 2015
@@ -21,14 +21,17 @@ package org.apache.aries.blueprint.itest
import java.util.List;
import org.apache.aries.blueprint.testbundles.BeanC;
+import org.apache.aries.blueprint.testbundles.BeanCItf;
import org.junit.Test;
import org.ops4j.pax.exam.Option;
import org.osgi.framework.Bundle;
import org.osgi.service.blueprint.container.BlueprintContainer;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
public class SpringTest extends AbstractBlueprintIntegrationTest {
@@ -42,8 +45,15 @@ public class SpringTest extends Abstract
List list = (List) container.getComponentInstance("springList");
System.out.println(list);
- BeanC beanC = (BeanC) list.get(4);
+ BeanCItf beanC = (BeanCItf) list.get(4);
assertEquals(1, beanC.getInitialized());
+
+ try {
+ beanC.doSomething();
+ fail("Should have thrown an exception because the transaction manager is not defined");
+ } catch (NoSuchBeanDefinitionException e) {
+ // expected
+ }
}
@org.ops4j.pax.exam.Configuration
Modified: aries/trunk/blueprint/blueprint-testbundles/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/pom.xml?rev=1716372&r1=1716371&r2=1716372&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundles/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-testbundles/pom.xml Wed Nov 25 12:32:56 2015
@@ -69,6 +69,12 @@
<version>4.2.2.RELEASE</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>4.2.2.RELEASE</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanC.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanC.java?rev=1716372&r1=1716371&r2=1716372&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanC.java (original)
+++ aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanC.java Wed Nov 25 12:32:56 2015
@@ -18,7 +18,9 @@ package org.apache.aries.blueprint.testb
import javax.annotation.PostConstruct;
-public class BeanC {
+import org.springframework.transaction.annotation.Transactional;
+
+public class BeanC implements BeanCItf {
private final BeanA beanA;
private int initialized;
@@ -32,6 +34,10 @@ public class BeanC {
this.initialized++;
}
+ @Transactional
+ public void doSomething() {
+ }
+
public int getInitialized() {
return initialized;
}
Added: aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanCItf.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanCItf.java?rev=1716372&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanCItf.java (added)
+++ aries/trunk/blueprint/blueprint-testbundles/src/main/java/org/apache/aries/blueprint/testbundles/BeanCItf.java Wed Nov 25 12:32:56 2015
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.blueprint.testbundles;
+
+public interface BeanCItf {
+
+ void doSomething();
+
+ int getInitialized();
+}