SONAR-2642 add DAOs to picocontainer + improve unit tests

1 files changed, 4 insertions, 0 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index 281418de6b7..2159a0a8b61 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -50,6 +50,7 @@ import org.sonar.jpa.session.*;
 import org.sonar.persistence.DatabaseMigrator;
 import org.sonar.persistence.DefaultDatabase;
 import org.sonar.persistence.MyBatis;
+import org.sonar.persistence.dao.DaoUtils;
 import org.sonar.server.charts.ChartFactory;
 import org.sonar.server.configuration.Backup;
 import org.sonar.server.configuration.ProfilesManager;
@@ -127,6 +128,9 @@ public final class Platform {
     rootContainer.addSingleton(DefaultDatabaseConnector.class);
     rootContainer.addSingleton(DefaultServerUpgradeStatus.class);
     rootContainer.addSingleton(DatabaseMigrator.class);
+    for (Class daoClass : DaoUtils.getDaoClasses()) {
+      rootContainer.addSingleton(daoClass);
+    }
     rootContainer.startComponents();
   }