Rename and fix tests that were not being executed by Maven

kiegroup · Mar 6, 2014 · 5696075 · 5696075
1 parent d2ea757
commit 5696075
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 21 deletions.
diff --git a/.../server/ProjectDataModelServiceTests.java → ...d/server/ProjectDataModelServiceTest.java b/.../server/ProjectDataModelServiceTests.java → ...d/server/ProjectDataModelServiceTest.java
@@ -20,7 +20,7 @@
 /**
  * Tests for DataModelService
  */
-public class ProjectDataModelServiceTests {
+public class ProjectDataModelServiceTest {
 
     private final SimpleFileSystemProvider fs = new SimpleFileSystemProvider();
     private BeanManager beanManager;
@@ -66,6 +66,9 @@ public void testProjectDataModelOracle() throws Exception {
         assertContains( "t3p2.Bean2",
                         oracle.getProjectModelFields().keySet() );
 
+        assertTrue( oracle.getProjectEventTypes().get( "t3p1.Bean1" ) );
+        assertFalse( oracle.getProjectEventTypes().get( "t3p2.Bean2" ) );
+
         assertEquals( 3,
                       oracle.getProjectModelFields().get( "t3p1.Bean1" ).length );
         assertContains( "this",
@@ -99,19 +102,8 @@ public void testProjectDataModelOracleJavaDefaultPackage() throws Exception {
 
         assertNotNull( oracle );
 
-        assertEquals( 1,
+        assertEquals( 0,
                       oracle.getProjectModelFields().size() );
-        assertContains( "Bean1",
-                        oracle.getProjectModelFields().keySet() );
-
-        assertEquals( 3,
-                      oracle.getProjectModelFields().get( "Bean1" ).length );
-        assertContains( "this",
-                        oracle.getProjectModelFields().get( "Bean1" ) );
-        assertContains( "field1",
-                        oracle.getProjectModelFields().get( "Bean1" ) );
-        assertContains( "field2",
-                        oracle.getProjectModelFields().get( "Bean1" ) );
     }
 
 }
diff --git a/...rver/ProjectDataModelSuperTypesTests.java → ...erver/ProjectDataModelSuperTypesTest.java b/...rver/ProjectDataModelSuperTypesTests.java → ...erver/ProjectDataModelSuperTypesTest.java
@@ -1,6 +1,7 @@
 package org.kie.workbench.common.services.datamodel.backend.server;
 
 import java.net.URL;
+import java.util.HashSet;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
@@ -20,7 +21,7 @@
 /**
  * Tests for DataModelService
  */
-public class ProjectDataModelSuperTypesTests {
+public class ProjectDataModelSuperTypesTest {
 
     private final SimpleFileSystemProvider fs = new SimpleFileSystemProvider();
     private BeanManager beanManager;
@@ -70,13 +71,14 @@ public void testProjectSuperTypes() throws Exception {
         assertContains( "t2p1.Bean4",
                         oracle.getProjectModelFields().keySet() );
 
-        assertNull( oracle.getProjectSuperTypes().get( "t2p1.Bean1" ) );
-        assertEquals( "t2p1.Bean1",
-                      oracle.getProjectSuperTypes().get( "t2p1.Bean2" ) );
-        assertEquals( "t2p1.Bean1",
-                      oracle.getProjectSuperTypes().get( "t2p2.Bean3" ) );
-        assertEquals( "t2p2.Bean3",
-                      oracle.getProjectSuperTypes().get( "t2p1.Bean4" ) );
+        assertContains( "java.lang.Object",
+                        new HashSet<String>( oracle.getProjectSuperTypes().get( "t2p1.Bean1" ) ) );
+        assertContains( "t2p1.Bean1",
+                        new HashSet<String>( oracle.getProjectSuperTypes().get( "t2p1.Bean2" ) ) );
+        assertContains( "t2p1.Bean1",
+                        new HashSet<String>( oracle.getProjectSuperTypes().get( "t2p2.Bean3" ) ) );
+        assertContains( "t2p2.Bean3",
+                        new HashSet<String>( oracle.getProjectSuperTypes().get( "t2p1.Bean4" ) ) );
     }
 
 }
diff --git a/...rc/test/java/org/kie/workbench/common/services/datamodel/backend/server/TestAppSetup.java b/...rc/test/java/org/kie/workbench/common/services/datamodel/backend/server/TestAppSetup.java
@@ -23,9 +23,11 @@
 
 import org.guvnor.common.services.project.service.KModuleService;
 import org.guvnor.m2repo.service.M2RepoService;
+import org.uberfire.backend.server.config.ConfigurationService;
 import org.uberfire.io.IOService;
 import org.uberfire.io.impl.IOServiceDotFileImpl;
 import org.uberfire.backend.repositories.Repository;
+import org.uberfire.rpc.SessionInfo;
 
 import static org.mockito.Mockito.*;
 import static org.uberfire.backend.server.repositories.SystemRepository.*;
@@ -54,4 +56,16 @@ public KModuleService kModuleService() {
         return mock( KModuleService.class );
     }
 
+    @Produces
+    @Alternative
+    public ConfigurationService configurationService() {
+        return mock( ConfigurationService.class );
+    }
+
+    @Produces
+    @Alternative
+    public SessionInfo sessionInfo() {
+        return mock( SessionInfo.class );
+    }
+
 }
diff --git a/...-datamodel-backend/src/test/resources/DataModelBackendTest1/src/main/java/t3p1/Bean1.java b/...-datamodel-backend/src/test/resources/DataModelBackendTest1/src/main/java/t3p1/Bean1.java
@@ -1,5 +1,8 @@
 package t3p1;
 
+import org.kie.api.definition.type.Role;
+
+@Role(Role.Type.EVENT)
 public class Bean1 {
 
     private String field1;