Skip to content

Commit

Permalink
final
Browse files Browse the repository at this point in the history
  • Loading branch information
begarco committed Feb 28, 2017
1 parent 63e15fa commit 4ec7f4c
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/EJBadass"/>
<classpathentry combineaccessrules="false" kind="src" path="/ejbadass-log-plugin"/>
<classpathentry combineaccessrules="false" kind="src" path="/ejbadass-transaction-plugin"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/EJBadass"/>
<classpathentry combineaccessrules="false" kind="src" path="/ejbadass-transaction-plugin"/>
<classpathentry combineaccessrules="false" kind="src" path="/ejbadass-log-plugin"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ deploy:
provider: releases
name: ejbadass-test
target_commitish: master
tag_name: 1.0.2
tag_name: 1.1.0
body: "Test project for the EJBadass container."
draft: false
prerelease: false
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[![Build Status](https://travis-ci.org/EJBadass/ejbadass-test.svg?branch=master)](https://travis-ci.org/EJBadass/ejbadass-test)
# ejbadass-test
Test project for the EJBadass container.
Test project for the EJBadass container.

## How to run the tests
You just have to download the test project, and use maven to run the tests, it will automatically download needed jars (ejbadass-api, ejbadass-log-plugin, ejbadass-transaction-plugin).
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<junit.version>4.12</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<version>1.0.2</version>
<version>1.1.0</version>
<packaging>jar</packaging>
<build>
<sourceDirectory>src</sourceDirectory>
Expand Down Expand Up @@ -54,17 +54,17 @@
<dependency>
<groupId>com.github.EJBadass</groupId>
<artifactId>ejbadass-api</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.github.EJBadass</groupId>
<artifactId>ejbadass-log-plugin</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.github.EJBadass</groupId>
<artifactId>ejbadass-transaction-plugin</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
</dependency>
</dependencies>
<reporting>
Expand Down
3 changes: 0 additions & 3 deletions src/fr/isima/ejbadass/stub/interfaces/ILogService.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package fr.isima.ejbadass.stub.interfaces;

import fr.isima.ejbadass.log.Log;

public interface ILogService {
@Log
void loggedMethod();
}
7 changes: 0 additions & 7 deletions src/fr/isima/ejbadass/stub/interfaces/ITransacService.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
package fr.isima.ejbadass.stub.interfaces;

import fr.isima.ejbadass.transaction.TransactionType;
import fr.isima.ejbadass.transaction.Transactional;

public interface ITransacService {
@Transactional(value=TransactionType.REQUIRED)
public void transactionalMethod(int i) throws Exception;
@Transactional(value=TransactionType.REQUIRED)
public void transactionalMethod2();
@Transactional(value=TransactionType.REQUIRES_NEW)
public void transactionalMethod3();
@Transactional(value=TransactionType.REQUIRED)
public void transactionalMethod4() throws Exception;
}
2 changes: 1 addition & 1 deletion src/fr/isima/ejbadass/test/TestTransaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void testRequiresRequires() throws Exception {
assertTrue(Transaction.numberOfCommit==c+1);
}

// begin & rollback
// tester service imbriqués et seconde transaction avec requires new
@Test
public void testRequiresRequiresNew() {
long b = Transaction.numberOfBegin,
Expand Down

0 comments on commit 4ec7f4c

Please sign in to comment.