ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-14564. Removed -Ignore from test cases, removed -Noncacheable annotation (Laszlo Puskas via smohanty)
Date Mon, 11 Jan 2016 14:38:59 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 107e46da8 -> 0ac47ee2e


AMBARI-14564. Removed -Ignore from test cases, removed -Noncacheable annotation (Laszlo Puskas
via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ac47ee2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ac47ee2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ac47ee2

Branch: refs/heads/branch-2.2
Commit: 0ac47ee2efa94593db9464b3aca30ada69d36579
Parents: 107e46d
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Mon Jan 11 06:38:33 2016 -0800
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Mon Jan 11 06:38:33 2016 -0800

----------------------------------------------------------------------
 .../ambari/server/orm/entities/AlertTargetEntity.java       | 2 --
 .../ambari/server/orm/dao/AlertDefinitionDAOTest.java       | 1 -
 .../apache/ambari/server/orm/dao/AlertDispatchDAOTest.java  | 9 +++++++--
 .../org/apache/ambari/server/orm/dao/RequestDAOTest.java    | 2 --
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ac47ee2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
index 4bbdd76..078e443 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
@@ -47,7 +47,6 @@ import javax.persistence.Table;
 import javax.persistence.TableGenerator;
 
 import org.apache.ambari.server.state.AlertState;
-import org.eclipse.persistence.annotations.Noncacheable;
 
 import com.google.common.collect.ImmutableSet;
 
@@ -91,7 +90,6 @@ public class AlertTargetEntity {
    * Bi-directional many-to-many association to {@link AlertGroupEntity}
    */
   @ManyToMany(mappedBy = "alertTargets", cascade = {CascadeType.MERGE, CascadeType.REFRESH})
-  @Noncacheable
   private Set<AlertGroupEntity> alertGroups;
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ac47ee2/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java
index 481797a..36e75e7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java
@@ -303,7 +303,6 @@ public class AlertDefinitionDAOTest {
    * @throws Exception
    */
   @Test
-  @Ignore
   public void testCascadeDelete() throws Exception {
     AlertDefinitionEntity definition = helper.createAlertDefinition(clusterId);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ac47ee2/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java
index 390385a..2518e0a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java
@@ -66,12 +66,18 @@ import org.apache.ambari.server.state.alert.SourceType;
 import org.apache.ambari.server.utils.EventBusSynchronizer;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.persist.PersistService;
+import com.google.inject.persist.UnitOfWork;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests {@link AlertDispatchDAO}.
@@ -494,7 +500,6 @@ public class AlertDispatchDAOTest {
    *
    */
   @Test
-  @Ignore
   public void testDeleteAssociatedTarget() throws Exception {
     AlertTargetEntity target = m_helper.createAlertTarget();
     Set<AlertTargetEntity> targets = new HashSet<AlertTargetEntity>();

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ac47ee2/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java
index 8d93f7d..edc1428 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java
@@ -43,7 +43,6 @@ import org.apache.ambari.server.orm.entities.StageEntity;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.inject.Guice;
@@ -98,7 +97,6 @@ public class RequestDAOTest {
 
 
   @Test
-  @Ignore
   public void testCalculatedStatus() throws Exception {
     createGraph();
 


Mime
View raw message