You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/02/10 19:46:26 UTC
ambari git commit: AMBARI-14972 - Add PK to
servicecomponentdesiredstate Table To Support FK Relationships
(jonathanhurley) (part2)
Repository: ambari
Updated Branches:
refs/heads/branch-dev-patch-upgrade c543ef8b2 -> 2a9f49c0e
AMBARI-14972 - Add PK to servicecomponentdesiredstate Table To Support FK Relationships (jonathanhurley) (part2)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a9f49c0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a9f49c0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a9f49c0
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 2a9f49c0e3a1839076fd271cb7caf09b3fc897f4
Parents: c543ef8
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Wed Feb 10 12:47:31 2016 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Wed Feb 10 12:47:38 2016 -0500
----------------------------------------------------------------------
.../apache/ambari/funtest/server/tests/DeleteServiceTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a9f49c0/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/tests/DeleteServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/tests/DeleteServiceTest.java b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/tests/DeleteServiceTest.java
index 472bdc4..747ae95 100644
--- a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/tests/DeleteServiceTest.java
+++ b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/tests/DeleteServiceTest.java
@@ -39,7 +39,6 @@ import org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity;
import org.apache.ambari.server.orm.entities.HostComponentStateEntity;
import org.apache.ambari.server.orm.entities.HostComponentDesiredStateEntity;
import org.apache.ambari.server.orm.entities.ServiceDesiredStateEntityPK;
-import org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntityPK;
import org.apache.ambari.server.state.State;
import org.apache.commons.httpclient.HttpStatus;
@@ -54,6 +53,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+
/**
* Simple test that starts the local ambari server,
* tests it's status and shuts down the server.
@@ -181,8 +181,7 @@ public class DeleteServiceTest extends ServerTestBase {
/**
* ServiceComponentDesiredStateDAO
*/
- ServiceComponentDesiredStateEntityPK serviceComponentDesiredStateEntityPK = injector.getInstance(ServiceComponentDesiredStateEntityPK.class);
- ServiceComponentDesiredStateEntity serviceComponentDesiredStateEntity = serviceComponentDesiredStateDAO.findByPK(serviceComponentDesiredStateEntityPK);
+ ServiceComponentDesiredStateEntity serviceComponentDesiredStateEntity = serviceComponentDesiredStateDAO.findById(0L);
assertTrue(serviceComponentDesiredStateEntity == null);
/**