BZ:1283537 - jbpmHumanTasksWithUser links PeopleAssignments_PotOwner…

…s task_id to AuditTaskImpl.id instead of AuditTaskImpl.taskId
kiegroup · Nov 24, 2015 · 8798f99 · 8798f99
1 parent fad2136
commit 8798f99
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 57 deletions.
diff --git a/kie-drools-wb/kie-drools-wb-webapp/pom.xml b/kie-drools-wb/kie-drools-wb-webapp/pom.xml
@@ -1254,18 +1254,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.gwt.gwtmockito</groupId>
-      <artifactId>gwtmockito</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency><!-- to get CallerMock in unit test-->
-      <groupId>org.uberfire</groupId>
-      <artifactId>uberfire-testing-utils</artifactId>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
   <build>

diff --git a/...wb-webapp/src/main/java/org/kie/workbench/drools/backend/server/DashbuilderBootstrap.java b/...wb-webapp/src/main/java/org/kie/workbench/drools/backend/server/DashbuilderBootstrap.java
@@ -50,10 +50,6 @@ public class DashbuilderBootstrap {
     @Inject
     protected DataSetDefRegistry dataSetDefRegistry;
 
-    public void setDataSetDefRegistry(DataSetDefRegistry dataSetDefRegistry){
-        this.dataSetDefRegistry = dataSetDefRegistry;
-    }
-
     @PostConstruct
     protected void init() {
         // figure out data source JNDI name
@@ -98,7 +94,7 @@ protected void registerDataSetDefinitions() {
                         + "from AuditTaskImpl t, "
                         + "PeopleAssignments_PotOwners po, "
                         + "OrganizationalEntity oe "
-                        + "where t.id = po.task_id and po.entity_id = oe.id", false)
+                        + "where t.taskId = po.task_id and po.entity_id = oe.id", false)
                 .date(DataSetTasksListGridViewImpl.COLUMN_ACTIVATIONTIME)
                 .label(DataSetTasksListGridViewImpl.COLUMN_ACTUALOWNER)
                 .label(DataSetTasksListGridViewImpl.COLUMN_CREATEDBY)
@@ -129,7 +125,7 @@ protected void registerDataSetDefinitions() {
                         + "from AuditTaskImpl t, "
                         + "PeopleAssignments_BAs bas, "
                         + "OrganizationalEntity oe "
-                        + "where t.id = bas.task_id and bas.entity_id = oe.id", false)
+                        + "where t.taskId = bas.task_id and bas.entity_id = oe.id", false)
                 .date(DataSetTasksListGridViewImpl.COLUMN_ACTIVATIONTIME)
                 .label(DataSetTasksListGridViewImpl.COLUMN_ACTUALOWNER)
                 .label(DataSetTasksListGridViewImpl.COLUMN_CREATEDBY)

diff --git a/...ebapp/src/test/java/org/kie/workbench/drools/backend/server/DashbuilderBootstrapTest.java b/...ebapp/src/test/java/org/kie/workbench/drools/backend/server/DashbuilderBootstrapTest.java
@@ -15,36 +15,30 @@
  */
 package org.kie.workbench.drools.backend.server;
 
-import com.google.gwtmockito.GwtMockitoTestRunner;
 import org.dashbuilder.dataset.def.DataSetDef;
 import org.dashbuilder.dataset.def.DataSetDefRegistry;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
-@RunWith(GwtMockitoTestRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class DashbuilderBootstrapTest {
 
     @Mock
     DataSetDefRegistry dataSetDefRegistryMock;
 
+    @InjectMocks
     DashbuilderBootstrap dashbuilderBootstrap;
 
-    @Before
-    public void setupMocks() {
-        dashbuilderBootstrap = new DashbuilderBootstrap();
-        dashbuilderBootstrap.setDataSetDefRegistry(dataSetDefRegistryMock);
-
-    }
-
     @Test
     public void registerDataSetDefinitionsTest() {
         dashbuilderBootstrap.registerDataSetDefinitions();
-        verify(dataSetDefRegistryMock,times(8)).registerDataSetDef(any(DataSetDef.class));
+        verify(dataSetDefRegistryMock,times(4)).registerDataSetDef(any(DataSetDef.class));
     }
 
 

diff --git a/kie-wb/kie-wb-webapp/pom.xml b/kie-wb/kie-wb-webapp/pom.xml
@@ -1486,17 +1486,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.gwt.gwtmockito</groupId>
-      <artifactId>gwtmockito</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency><!-- to get CallerMock in unit test-->
-      <groupId>org.uberfire</groupId>
-      <artifactId>uberfire-testing-utils</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
 

diff --git a/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/backend/DashbuilderBootstrap.java b/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/backend/DashbuilderBootstrap.java
@@ -60,11 +60,6 @@ public class DashbuilderBootstrap {
     @Inject
     protected DataSetDefRegistry dataSetDefRegistry;
 
-
-    public void setDataSetDefRegistry(DataSetDefRegistry dataSetDefRegistry){
-        this.dataSetDefRegistry = dataSetDefRegistry;
-    }
-
     @PostConstruct
     protected void init() {
         // figure out data source JNDI name
@@ -130,7 +125,7 @@ protected void registerDataSetDefinitions() {
                                 + "from AuditTaskImpl t, "
                                 + "PeopleAssignments_PotOwners po, "
                                 + "OrganizationalEntity oe "
-                                + "where t.id = po.task_id and po.entity_id = oe.id", false)
+                                + "where t.taskId = po.task_id and po.entity_id = oe.id", false)
                         .date(DataSetTasksListGridViewImpl.COLUMN_ACTIVATIONTIME)
                         .label(DataSetTasksListGridViewImpl.COLUMN_ACTUALOWNER)
                         .label(DataSetTasksListGridViewImpl.COLUMN_CREATEDBY)
@@ -161,7 +156,7 @@ protected void registerDataSetDefinitions() {
                                 + "from AuditTaskImpl t, "
                                 + "PeopleAssignments_BAs bas, "
                                 + "OrganizationalEntity oe "
-                                + "where t.id = bas.task_id and bas.entity_id = oe.id", false)
+                                + "where t.taskId = bas.task_id and bas.entity_id = oe.id", false)
                         .date(DataSetTasksListGridViewImpl.COLUMN_ACTIVATIONTIME)
                         .label(DataSetTasksListGridViewImpl.COLUMN_ACTUALOWNER)
                         .label(DataSetTasksListGridViewImpl.COLUMN_CREATEDBY)

diff --git a/kie-wb/kie-wb-webapp/src/test/java/org/kie/workbench/backend/DashbuilderBootstrapTest.java b/kie-wb/kie-wb-webapp/src/test/java/org/kie/workbench/backend/DashbuilderBootstrapTest.java
@@ -15,32 +15,26 @@
  */
 package org.kie.workbench.backend;
 
-import com.google.gwtmockito.GwtMockitoTestRunner;
 import org.dashbuilder.dataset.def.DataSetDef;
 import org.dashbuilder.dataset.def.DataSetDefRegistry;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
-@RunWith(GwtMockitoTestRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class DashbuilderBootstrapTest {
 
     @Mock
     DataSetDefRegistry dataSetDefRegistryMock;
 
+    @InjectMocks
     DashbuilderBootstrap dashbuilderBootstrap;
 
-    @Before
-    public void setupMocks() {
-        dashbuilderBootstrap = new DashbuilderBootstrap();
-        dashbuilderBootstrap.setDataSetDefRegistry(dataSetDefRegistryMock);
-
-    }
-
     @Test
     public void registerDataSetDefinitionsTest() {
         dashbuilderBootstrap.registerDataSetDefinitions();