svn commit: r1444471 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test: AbstractOpenmeetingsSpringTest.java backup/TestOldBackups.java

[solomax]

Author: solomax
Date: Sun Feb 10 02:02:56 2013
New Revision: 1444471

URL: http://svn.apache.org/r1444471
Log:
Proper OM home is set while performing import tests.

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1444471&r1=1444470&r2=1444471&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
 Sun Feb 10 02:02:56 2013
@@ -125,12 +125,16 @@ public abstract class AbstractOpenmeetin
                return users;
        }
 
-       private void makeDefaultScheme() throws Exception {
+       protected void setOmHome() {
                String webappsDir = System.getProperty("webapps.root", ".");
                OmFileHelper.setOmHome(webappsDir);
                if (!OmFileHelper.getOmHome().exists() || 
!OmFileHelper.getOmHome().isDirectory()) {
                        fail("Invalid directory is specified as OM HOME: " + 
webappsDir);
                }
+       }
+       
+       private void makeDefaultScheme() throws Exception {
+               setOmHome();
                importInitvalues.loadAll(new InstallationConfig(), username, 
userpass,
                                useremail, orgname, timeZone, false);
        }

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1444471&r1=1444470&r2=1444471&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/backup/TestOldBackups.java
 Sun Feb 10 02:02:56 2013
@@ -16,6 +16,7 @@ public class TestOldBackups extends Abst
        
        @Test
        public void importOldVersions() {
+               setOmHome();
                String backupsDir = System.getProperty("backups.dir", ".");
                File backupsHome = new File(backupsDir);