apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed unit test

Browse Source
This commit is contained in:
Alex Huang 2011-03-17 10:40:59 -07:00
parent b272d20d34
commit b18b2a68b1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/upgrade/dao/DatabaseUpgradeChecker.java
View File

@ -45,7 +45,7 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
VersionDao _dao;
public DatabaseUpgradeChecker() {
_dao = ComponentLocator.inject(VersionDaoImpl.class);
_upgradeMap.put(new Pair<String, String>("2.1.7", "2.2.3"), new DbUpgrade[] { new Upgrade217to22(), new UpgradeSnapshot217to223()});
_upgradeMap.put(new Pair<String, String>("2.1.7", "2.2.3"), new DbUpgrade[] { new Upgrade217to22(), new Upgrade221to222(), new UpgradeSnapshot217to223()});
}
protected void runScript(File file) {

10
server/test/com/cloud/upgrade/dao/PortForwarding217To221UpgradeTest.java
View File

@ -24,8 +24,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import javax.naming.ConfigurationException;
import junit.framework.TestCase;
import org.apache.log4j.Logger;
@ -62,6 +60,7 @@ public class PortForwarding217To221UpgradeTest extends TestCase {
PreparedStatement pstmt;
VersionDaoImpl dao = ComponentLocator.inject(VersionDaoImpl.class);
DatabaseUpgradeChecker checker = ComponentLocator.inject(DatabaseUpgradeChecker.class);
String version = dao.getCurrentVersion();
@ -71,12 +70,7 @@ public class PortForwarding217To221UpgradeTest extends TestCase {
s_logger.debug("Port forwarding test version is " + version);
}
try {
dao.upgrade("2.1.7", "2.2.3");
} catch (ConfigurationException e) {
s_logger.warn("Exception: ", e);
assert false : "The test failed. Check logs";
}
checker.upgrade("2.1.7", "2.2.3");
conn = Transaction.getStandaloneConnection();
try {