[jboss-svn-commits] JBL Code SVN: r32273 - in labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src: main/resources and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-03-29 09:22:46 -0400 (Mon, 29 Mar 2010)
New Revision: 32273

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/spring.xml
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
Log:
Fixed loading properties file.
Added lkrzyzanek to property file.
Added test.

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/spring.xml	2010-03-29 13:08:09 UTC (rev 32272)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/plugin/spring.xml	2010-03-29 13:22:46 UTC (rev 32273)
@@ -15,7 +15,12 @@
     <property name="blogManager" ref="blogManager" />
 
     <property name="oldBlogUsersMap">
-      <value>classpath:oldBlogUsersMap.properties</value>
+      <bean
+        class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+        <property name="location">
+          <value>classpath:oldBlogUsersMap.properties</value>
+        </property>
+      </bean>
     </property>
 
   </bean>

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties	2010-03-29 13:08:09 UTC (rev 32272)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties	2010-03-29 13:22:46 UTC (rev 32273)
@@ -46,3 +46,4 @@
 tfox=timfox
 theute=thomas.heute at jboss.com
 wprice=
+lkrzyzanek=lkrzyzanek

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java	2010-03-29 13:08:09 UTC (rev 32272)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java	2010-03-29 13:22:46 UTC (rev 32273)
@@ -25,7 +25,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Date;
+import java.util.Properties;
 
 import org.jboss.labs.sbs.plugin.bm.dao.OldBlogEntryBean;
 import org.junit.Test;
@@ -65,4 +67,17 @@
     assertEquals("/some/path/entry1.meta", metaPath);
   }
 
+  @Test
+  public void testGetSBSUsername() throws IOException {
+    DbOldBlogsManager manager = new DbOldBlogsManager();
+
+    Properties oldBlogUsersMap = new Properties();
+    InputStream is = DbOldBlogsManagerTest.class.getResourceAsStream("/oldBlogUsersMap.properties");
+    oldBlogUsersMap.load(is);
+    is.close();
+
+    manager.setOldBlogUsersMap(oldBlogUsersMap);
+
+    assertEquals("lkrzyzanek", manager.getSBSUsername("lkrzyzanek"));
+  }
 }