Fix CDI test issues.

project-ncl · Nov 17, 2015 · 0c96261 · 0c96261
1 parent 04b38f0
commit 0c96261
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 19 deletions.
diff --git a/...nator/src/main/java/org/jboss/pnc/core/builder/coordinator/local/LocalBuildScheduler.java b/...nator/src/main/java/org/jboss/pnc/core/builder/coordinator/local/LocalBuildScheduler.java
@@ -70,6 +70,6 @@ public void startBuilding(BuildTask buildTask, Consumer<BuildStatus> onComplete)
                 buildTask.getId(),
                 buildTask.getSubmitTime()
         );
-        buildExecutor.startBuilding(buildExecutionTask, onComplete);
+        buildExecutor.startBuilding(buildExecutionTask, onComplete); //TODO can we use buildExecutor.build and make startBuilding private
     }
 }
diff --git a/...dinator/src/main/java/org/jboss/pnc/core/notifications/buildSetTask/BuildSetCallBack.java b/...dinator/src/main/java/org/jboss/pnc/core/notifications/buildSetTask/BuildSetCallBack.java
@@ -28,11 +28,6 @@ public class BuildSetCallBack {
     private Integer buildSetTaskId;
     private Consumer<BuildSetStatusChangedEvent> callback;
 
-    @Deprecated //CDI workaround
-    public BuildSetCallBack() {
-        buildSetTaskId = -1;//CDI arquillian workaround
-    }
-
     public BuildSetCallBack(int buildSetTaskId, Consumer<BuildSetStatusChangedEvent> callback) {
         this.buildSetTaskId = buildSetTaskId;
         this.callback = callback;
@@ -43,8 +38,6 @@ public Integer getBuildSetTaskId() {
     }
 
     public void callback(BuildSetStatusChangedEvent buildSetStatusChangedEvent) {
-        if (callback != null) {
-            callback.accept(buildSetStatusChangedEvent);
-        }
+        callback.accept(buildSetStatusChangedEvent);
     }
 }
diff --git a/build-coordinator/src/test/java/org/jboss/pnc/core/test/buildCoordinator/ProjectBuilder.java b/build-coordinator/src/test/java/org/jboss/pnc/core/test/buildCoordinator/ProjectBuilder.java
@@ -24,18 +24,26 @@
 import org.jboss.pnc.core.builder.coordinator.BuildSetTask;
 import org.jboss.pnc.core.builder.coordinator.BuildTask;
 import org.jboss.pnc.core.builder.coordinator.filtering.BuildTaskFilter;
+import org.jboss.pnc.core.builder.datastore.DatastoreAdapter;
+import org.jboss.pnc.core.builder.executor.BuildExecutor;
 import org.jboss.pnc.core.content.ContentIdentityManager;
+import org.jboss.pnc.core.events.DefaultBuildStatusChangedEvent;
 import org.jboss.pnc.core.exception.CoreException;
+import org.jboss.pnc.core.notifications.buildSetTask.BuildSetCallBack;
+import org.jboss.pnc.core.notifications.buildTask.BuildCallBack;
 import org.jboss.pnc.core.test.buildCoordinator.event.TestCDIBuildStatusChangedReceiver;
 import org.jboss.pnc.core.test.configurationBuilders.TestProjectConfigurationBuilder;
 import org.jboss.pnc.core.test.mock.BuildDriverMock;
 import org.jboss.pnc.core.test.mock.DatastoreMock;
+import org.jboss.pnc.core.test.mock.EnvironmentDriverMock;
+import org.jboss.pnc.core.test.mock.RepositoryManagerMock;
+import org.jboss.pnc.core.test.mock.RepositorySessionMock;
+import org.jboss.pnc.core.test.mock.TestEntitiesFactory;
 import org.jboss.pnc.model.Artifact;
 import org.jboss.pnc.model.BuildConfiguration;
 import org.jboss.pnc.model.BuildConfigurationSet;
-import org.jboss.pnc.model.mock.MockUser;
 import org.jboss.pnc.model.BuildEnvironment;
-import org.jboss.pnc.model.User;
+import org.jboss.pnc.model.mock.MockUser;
 import org.jboss.pnc.spi.BuildSetStatus;
 import org.jboss.pnc.spi.BuildStatus;
 import org.jboss.pnc.spi.datastore.DatastoreException;
@@ -85,12 +93,27 @@ public static JavaArchive createDeployment() {
                 .addClass(Configuration.class)
                 .addClass(BuildEnvironment.Builder.class)
                 .addClass(TestCDIBuildStatusChangedReceiver.class)
+                .addPackages(false,
+                        BuildDriverFactory.class.getPackage())
                 .addPackages(true,
-                        BuildDriverFactory.class.getPackage(),
-                        BuildDriverMock.class.getPackage(),
+                        BuildCoordinator.class.getPackage(),
+                        DatastoreAdapter.class.getPackage(),
+                        BuildExecutor.class.getPackage(),
+                        TestProjectConfigurationBuilder.class.getPackage(),
                         ContentIdentityManager.class.getPackage(),
                         BuildConfigSetRecordRepository.class.getPackage(),
-                        BuildTaskFilter.class.getPackage())
+                        BuildTaskFilter.class.getPackage(),
+                        TestCDIBuildStatusChangedReceiver.class.getPackage(),
+                        BuildSetCallBack.class.getPackage(),
+                        BuildCallBack.class.getPackage(),
+                        BuildStatus.class.getPackage(),
+                        DefaultBuildStatusChangedEvent.class.getPackage())
+                .addClass(BuildDriverMock.class)
+                .addClass(DatastoreMock.class)
+                .addClass(EnvironmentDriverMock.class)
+                .addClass(RepositoryManagerMock.class)
+                .addClass(RepositorySessionMock.class)
+                .addClass(TestEntitiesFactory.class)
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
                 .addAsResource("META-INF/logging.properties");
 

diff --git a/...nator/src/test/java/org/jboss/pnc/core/test/buildCoordinator/event/StatusUpdatesTest.java b/...nator/src/test/java/org/jboss/pnc/core/test/buildCoordinator/event/StatusUpdatesTest.java
@@ -26,13 +26,19 @@
 import org.jboss.pnc.core.builder.coordinator.BuildCoordinator;
 import org.jboss.pnc.core.builder.coordinator.BuildSetTask;
 import org.jboss.pnc.core.builder.coordinator.BuildTask;
+import org.jboss.pnc.core.builder.datastore.DatastoreAdapter;
+import org.jboss.pnc.core.builder.executor.DefaultBuildExecutor;
 import org.jboss.pnc.core.exception.CoreException;
 import org.jboss.pnc.core.notifications.buildSetTask.BuildSetCallBack;
 import org.jboss.pnc.core.notifications.buildSetTask.BuildSetStatusNotifications;
 import org.jboss.pnc.core.notifications.buildTask.BuildCallBack;
 import org.jboss.pnc.core.notifications.buildTask.BuildStatusNotifications;
 import org.jboss.pnc.core.test.configurationBuilders.TestProjectConfigurationBuilder;
 import org.jboss.pnc.core.test.mock.BuildDriverMock;
+import org.jboss.pnc.core.test.mock.DatastoreMock;
+import org.jboss.pnc.core.test.mock.EnvironmentDriverMock;
+import org.jboss.pnc.core.test.mock.RepositoryManagerMock;
+import org.jboss.pnc.core.test.mock.RepositorySessionMock;
 import org.jboss.pnc.model.BuildConfigurationSet;
 import org.jboss.pnc.model.User;
 import org.jboss.pnc.spi.BuildSetStatus;
@@ -89,11 +95,21 @@ public static JavaArchive createDeployment() {
                 .addPackages(true,
                         Configuration.class.getPackage(),
                         StatusUpdatesTest.class.getPackage(),
-                        BuildDriverMock.class.getPackage(),
                         BuildCoordinator.class.getPackage(),
-                        BuildDriverFactory.class.getPackage(),
                         BuildSetStatusChangedEvent.class.getPackage(),
                         Observes.class.getPackage())
+                .addPackages(false,
+                        BuildDriverFactory.class.getPackage(),
+                        DatastoreAdapter.class.getPackage(),
+                        BuildStatusNotifications.class.getPackage(),
+                        BuildSetStatusNotifications.class.getPackage(),
+                        DefaultBuildExecutor.class.getPackage(),
+                        TestProjectConfigurationBuilder.class.getPackage())
+                .addClass(BuildDriverMock.class)
+                .addClass(DatastoreMock.class)
+                .addClass(EnvironmentDriverMock.class)
+                .addClass(RepositoryManagerMock.class)
+                .addClass(RepositorySessionMock.class)
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
                 .addAsResource("META-INF/logging.properties");
         log.debug(jar.toString(true));

diff --git a/...ava/org/jboss/pnc/core/test/buildCoordinator/event/TestCDIBuildStatusChangedReceiver.java b/...ava/org/jboss/pnc/core/test/buildCoordinator/event/TestCDIBuildStatusChangedReceiver.java
@@ -27,7 +27,7 @@
 
 @ApplicationScoped
 public class TestCDIBuildStatusChangedReceiver {
-
+    //TODO instance should not be used with @ApplicationScoped
     public static final TestCDIBuildStatusChangedReceiver INSTANCE = new TestCDIBuildStatusChangedReceiver();
 
     private List<Consumer<BuildStatusChangedEvent>> listeners = new LinkedList<>();

diff --git a/pom.xml b/pom.xml
@@ -434,7 +434,7 @@
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-common-core</artifactId>
-        <version>2.2.22.GA</version>
+        <version>2.2.22.GA</version> <!-- TODO upgrade to 2.5-->
       </dependency>
 
       <dependency>
@@ -501,7 +501,7 @@
       <dependency>
         <groupId>org.jboss.weld</groupId>
         <artifactId>weld-core</artifactId>
-        <version>1.1.5.Final</version>
+        <version>1.1.5.Final</version> <!-- TODO upgrade to weld 2.3.1 or at least 1.1.29 -->
       </dependency>
 
       <dependency>