Fix tests

eclipse-che · Dec 21, 2016 · f22e6a6 · f22e6a6
1 parent af9f5ba
commit f22e6a6
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 243 deletions.
diff --git a/core/che-core-db/pom.xml b/core/che-core-db/pom.xml
@@ -75,6 +75,11 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/CascadeEventService.java b/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/CascadeEventService.java
@@ -51,7 +51,7 @@ public class CascadeEventService extends EventService {
      * @param event
      *         event to publish
      * @throws ApiException
-     *         when some error occurs during operation publishing
+     *         when any subscriber throws {@link ApiException}
      */
     public void publish(CascadeEvent event) throws ApiException {
         super.publish(event);

diff --git a/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/event/CascadeEvent.java b/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/event/CascadeEvent.java
@@ -10,13 +10,15 @@
  *******************************************************************************/
 package org.eclipse.che.core.db.cascade.event;
 
+import org.eclipse.che.api.core.ApiException;
 import org.eclipse.che.core.db.cascade.CascadeContext;
 
 /**
  * Special event type which is needed only for notification
  * in the process which can require cascade operation.
  *
- * //TODO Add information about transaction
+ * <p>Rollback of operation must be performed when subscriber
+ * throws {@link ApiException} during event processing.
  *
  * @author Anton Korneta
  * @author Sergii Leschenko

diff --git a/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/event/PersistEvent.java b/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/event/PersistEvent.java
@@ -17,7 +17,7 @@
 /**
  * Cascade event about an entity persisting.
  *
- * <p>{@link ConflictException} or {@link ServerException} can be
+ * <p>{@link ConflictException} or {@link ServerException} can be thrown
  * during event publishing.
  *
  * @author Sergii Leschenko

diff --git a/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/event/RemoveEvent.java b/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/event/RemoveEvent.java
@@ -17,7 +17,7 @@
 /**
  * Cascade event about an entity removing.
  *
- * <p>{@link ConflictException} or {@link ServerException} can be
+ * <p>{@link ConflictException} or {@link ServerException} can be thrown
  * during event publishing.
  *
  * @see CascadeEventService#publish(RemoveEvent)

diff --git a/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/event/UpdateEvent.java b/core/che-core-db/src/main/java/org/eclipse/che/core/db/cascade/event/UpdateEvent.java
@@ -18,8 +18,8 @@
 /**
  * Cascade event about an entity updating.
  *
- * <p>{@link NotFoundException}, {@link ConflictException} or {@link ServerException} can be
- * during event publishing.
+ * <p>{@link NotFoundException}, {@link ConflictException} or {@link ServerException}
+ * can be thrown during event publishing.
  *
  * @author Sergii Leschenko
  * @see CascadeEventService#publish(UpdateEvent)

diff --git a/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/CascadeEventServiceTest.java b/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/CascadeEventServiceTest.java
diff --git a/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/Event.java b/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/Event.java
diff --git a/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/EventPublisher.java b/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/EventPublisher.java
diff --git a/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/Subscriber.java b/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/Subscriber.java
diff --git a/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/TestEntity.java b/core/che-core-db/src/test/java/org/eclipse/che/core/db/cascade/TestEntity.java
diff --git a/core/che-core-db/src/test/resources/META-INF/persistence.xml b/core/che-core-db/src/test/resources/META-INF/persistence.xml
diff --git a/.../che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/spi/RecipeDao.java b/.../che-core-api-machine/src/main/java/org/eclipse/che/api/machine/server/spi/RecipeDao.java
@@ -66,7 +66,7 @@ public interface RecipeDao {
      * @throws NullPointerException
      *         when recipe {@code id} is not specified
      * @throws ConflictException
-     *         when recipe cannot be removed
+     *         when any conflict occurs during cascade removing of related to recipe data
      * @throws ServerException
      *         when any error occurs
      */

diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/jpa/JpaUserDao.java b/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/jpa/JpaUserDao.java
@@ -241,7 +241,7 @@ protected void doUpdate(UserImpl update) throws NotFoundException, ConflictExcep
                                                       new UserImpl(update)));
     }
 
-    @Transactional(rollbackOn = {RuntimeException.class, ApiException.class})
+    @Transactional(rollbackOn = {RuntimeException.class})
     protected Optional<UserImpl> doRemove(String id) throws ConflictException, ServerException {
         final EntityManager manager = managerProvider.get();
         final UserImpl user = manager.find(UserImpl.class, id);

diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/spi/UserDao.java b/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/spi/UserDao.java
@@ -94,7 +94,7 @@ public interface UserDao {
      * @throws NullPointerException
      *         when {@code id} is null
      * @throws ConflictException
-     *         when given user cannot be deleted
+     *         when any conflict occurs during cascade removing of related to user data
      * @throws ServerException
      *         when any other error occurs
      */