Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java Tue Jun 26 18:18:57 2012 @@ -19,8 +19,8 @@ package org.apache.rave.gadgets.oauth.service.impl; -import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo; -import org.apache.rave.gadgets.oauth.repository.OAuthTokenInfoRepository; +import org.apache.rave.portal.model.OAuthTokenInfo; +import org.apache.rave.portal.repository.OAuthTokenInfoRepository; import org.apache.rave.gadgets.oauth.service.OAuthTokenInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java Tue Jun 26 18:18:57 2012 @@ -20,10 +20,11 @@ package org.apache.rave.opensocial.service.impl; import org.apache.commons.lang.StringUtils; -import org.apache.rave.opensocial.model.ApplicationData; -import org.apache.rave.portal.model.Person; -import org.apache.rave.opensocial.repository.ApplicationDataRepository; +import org.apache.rave.portal.model.ApplicationData; +import org.apache.rave.portal.model.impl.ApplicationDataImpl; +import org.apache.rave.portal.repository.ApplicationDataRepository; import org.apache.rave.opensocial.service.SimplePersonService; +import org.apache.rave.portal.model.Person; import org.apache.rave.service.LockService; import org.apache.shindig.auth.SecurityToken; import org.apache.shindig.common.util.ImmediateFuture; @@ -162,7 +163,7 @@ public class DefaultAppDataService imple //if there is no data, create an empty object to store the data in that we'll save when we're done if (applicationData == null) { - applicationData = new ApplicationData(null, personId, appId, new HashMap<String, String>()); + applicationData = new ApplicationDataImpl(null, personId, appId, new HashMap<String, String>()); } //if the fields parameter is empty, we can just use the values map directly since this is a full update @@ -231,8 +232,8 @@ public class DefaultAppDataService imple private List<String> convertPeopleToUserIds(List<Person> people) { List<String> ids = new ArrayList<String>(people.size()); - for (Person person : people) { - ids.add(String.valueOf(person.getEntityId())); + for (org.apache.rave.portal.model.Person person : people) { + ids.add(String.valueOf(person.getUsername())); } return ids; } Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java Tue Jun 26 18:18:57 2012 @@ -20,7 +20,7 @@ package org.apache.rave.opensocial.service.impl; import com.google.common.collect.Lists; -import org.apache.rave.opensocial.repository.PersonRepository; +import org.apache.rave.opensocial.repository.OpenSocialPersonRepository; import org.apache.rave.opensocial.service.SimplePersonService; import org.apache.rave.util.CollectionUtils; import org.apache.shindig.auth.SecurityToken; @@ -47,10 +47,10 @@ import java.util.concurrent.Future; @Service public class DefaultPersonService implements PersonService, SimplePersonService { - private final PersonRepository repository; + private final OpenSocialPersonRepository repository; @Autowired - public DefaultPersonService(PersonRepository repository) { + public DefaultPersonService(OpenSocialPersonRepository repository) { this.repository = repository; } Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java Tue Jun 26 18:18:57 2012 @@ -26,6 +26,7 @@ import org.apache.rave.util.CollectionUt import org.apache.shindig.protocol.model.Enum; import org.apache.shindig.protocol.model.EnumImpl; import org.apache.shindig.social.core.model.*; +import org.apache.shindig.social.core.model.AddressImpl; import org.apache.shindig.social.opensocial.model.*; import org.apache.shindig.social.opensocial.model.Address; import org.apache.shindig.social.opensocial.model.Organization; @@ -110,7 +111,7 @@ public class FieldRestrictingPerson impl @Override public List<Address> getAddresses() { - return displayField(Field.ADDRESSES) ? convertAddresses(internal.getAddresses()) : null; + return displayField(Field.ADDRESSES) ? convertAddresses(internal.getAddresses()) : null; } @Override @@ -340,7 +341,7 @@ public class FieldRestrictingPerson impl //REQUIRED FIELD @Override public String getId() { - return internal.getEntityId().toString(); + return internal.getUsername(); } @Override @@ -826,7 +827,7 @@ public class FieldRestrictingPerson impl private static Url convertToUrl(PersonProperty property) { return new UrlImpl(property.getValue(), property.getExtendedValue(), property.getQualifier()); } - + private List<Address> convertAddresses(List<org.apache.rave.portal.model.Address> addresses) { List<Address> converted = new ArrayList<Address>(); if(addresses != null) { @@ -896,7 +897,7 @@ public class FieldRestrictingPerson impl } private Organization convertOrganization(org.apache.rave.portal.model.Organization org) { - Organization converted = new OrganizationImpl(); + Organization converted = new org.apache.shindig.social.core.model.OrganizationImpl(); converted.setAddress(convertAddress(org.getAddress())); converted.setDescription(org.getDescription()); converted.setStartDate(org.getStartDate()); Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java Tue Jun 26 18:18:57 2012 @@ -19,13 +19,12 @@ package org.apache.rave.gadgets.oauth.inject; -import java.io.IOException; -import java.util.Date; - import net.oauth.OAuth; import net.oauth.OAuthServiceProvider; -import org.apache.rave.gadgets.oauth.model.OAuthConsumerStore; -import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo; +import org.apache.rave.portal.model.OAuthConsumerStore; +import org.apache.rave.portal.model.OAuthTokenInfo; +import org.apache.rave.portal.model.impl.OAuthConsumerStoreImpl; +import org.apache.rave.portal.model.impl.OAuthTokenInfoImpl; import org.apache.rave.gadgets.oauth.service.OAuthConsumerStoreService; import org.apache.rave.gadgets.oauth.service.OAuthTokenInfoService; import org.apache.shindig.auth.SecurityToken; @@ -36,9 +35,12 @@ import org.junit.Before; import org.junit.Test; import org.springframework.test.util.ReflectionTestUtils; +import java.io.IOException; +import java.util.Date; + import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; -import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * Test for {@link DefaultOAuthStore} @@ -56,7 +58,7 @@ public class DefaultOAuthStoreTest { @Test public void testGetConsumerKeyAndSecret() throws Exception { - OAuthConsumerStore consumerStore = new OAuthConsumerStore(); + OAuthConsumerStore consumerStore = new OAuthConsumerStoreImpl(); consumerStore.setGadgetUri(GADGET_URI); consumerStore.setConsumerKey("gadgetConsumer"); consumerStore.setConsumerSecret(CONSUMER_SECRET); @@ -81,13 +83,13 @@ public class DefaultOAuthStoreTest { public void testGetTokenInfo() throws Exception { final String testTokenName = "testTokenName"; - OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfo(); + OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfoImpl(); oAuthTokenInfo.setTokenName(testTokenName); oAuthTokenInfo.setTokenSecret(CONSUMER_SECRET); OAuthStore.ConsumerInfo consumerInfo = createMock(OAuthStore.ConsumerInfo.class); expect(tokenInfoService.findOAuthTokenInfo(token.getViewerId(), token.getAppUrl(), - OAuthTokenInfo.MODULE_ID, testTokenName, + OAuthTokenInfoImpl.MODULE_ID, testTokenName, SERVICE_NAME)).andReturn(oAuthTokenInfo); replay(tokenInfoService); Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java Tue Jun 26 18:18:57 2012 @@ -19,8 +19,9 @@ package org.apache.rave.gadgets.oauth.service; -import org.apache.rave.gadgets.oauth.model.OAuthConsumerStore; -import org.apache.rave.gadgets.oauth.repository.OAuthConsumerStoreRepository; +import org.apache.rave.portal.model.OAuthConsumerStore; +import org.apache.rave.portal.model.impl.OAuthConsumerStoreImpl; +import org.apache.rave.portal.repository.OAuthConsumerStoreRepository; import org.apache.rave.gadgets.oauth.service.impl.DefaultOAuthConsumerStoreService; import org.junit.Before; import org.junit.Test; @@ -69,7 +70,7 @@ public class DefaultOAuthConsumerStoreSe } OAuthConsumerStore getOAuthConsumerStore() { - OAuthConsumerStore consumerStore = new OAuthConsumerStore(); + OAuthConsumerStore consumerStore = new OAuthConsumerStoreImpl(); consumerStore.setCallbackUrl("http://oauth.gmodules.com/gadgets/oauthcallback";); consumerStore.setConsumerKey("gadgetConsumer"); consumerStore.setConsumerSecret("gadgetSecret"); Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java Tue Jun 26 18:18:57 2012 @@ -19,8 +19,9 @@ package org.apache.rave.gadgets.oauth.service; -import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo; -import org.apache.rave.gadgets.oauth.repository.OAuthTokenInfoRepository; +import org.apache.rave.portal.model.OAuthTokenInfo; +import org.apache.rave.portal.model.impl.OAuthTokenInfoImpl; +import org.apache.rave.portal.repository.OAuthTokenInfoRepository; import org.apache.rave.gadgets.oauth.service.impl.DefaultOAuthTokenInfoService; import org.apache.shindig.auth.SecurityToken; import org.apache.shindig.gadgets.oauth.OAuthStore; @@ -28,11 +29,7 @@ import org.junit.Before; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import static org.easymock.EasyMock.*; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -106,6 +103,8 @@ public class DefaultOAuthTokenInfoServic expect(tokenInfo.getTokenExpireMillis()).andReturn(3600000L); expect(tokenInfo.getTokenSecret()).andReturn("tokenSecret"); replay(securityToken, tokenInfo); - return new OAuthTokenInfo(securityToken, SERVICE_NAME, TOKEN_NAME, tokenInfo); + return new OAuthTokenInfoImpl(securityToken.getAppUrl(), SERVICE_NAME, TOKEN_NAME, tokenInfo.getAccessToken(), + tokenInfo.getSessionHandle(), tokenInfo.getTokenSecret(), + securityToken.getViewerId(), tokenInfo.getTokenExpireMillis()); } } Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/inject/SpringBindingModuleTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/inject/SpringBindingModuleTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/inject/SpringBindingModuleTest.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/inject/SpringBindingModuleTest.java Tue Jun 26 18:18:57 2012 @@ -22,24 +22,15 @@ package org.apache.rave.inject; import com.google.inject.Guice; import com.google.inject.Injector; import org.apache.rave.opensocial.service.impl.DefaultPersonService; -import org.apache.rave.persistence.BasicEntity; -import org.apache.rave.persistence.jpa.AbstractJpaRepository; import org.apache.shindig.social.opensocial.spi.PersonService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.LocalEntityManagerFactoryBean; -import org.springframework.stereotype.Repository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.CoreMatchers.sameInstance; +import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) @@ -70,25 +61,6 @@ public class SpringBindingModuleTest { assertThat(personService1, is(sameInstance(personService2))); } - @Test - public void bindsProxiedBean() { - LocalEntityManagerFactoryBean factory = injector.getInstance(LocalEntityManagerFactoryBean.class); - assertThat(factory, is(not(nullValue()))); - } - @Test - public void multipleRepositories() { - TestRepo repo = injector.getInstance(TestRepo.class); - assertThat(repo, is(not(nullValue()))); - } - public static interface TestRepo extends org.apache.rave.persistence.Repository<BasicEntity> {} - - @Repository - public static class JpaTestRepo extends AbstractJpaRepository<BasicEntity> implements TestRepo { - - protected JpaTestRepo() { - super(BasicEntity.class); - } - } } Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java Tue Jun 26 18:18:57 2012 @@ -19,10 +19,12 @@ package org.apache.rave.opensocial.service; -import org.apache.rave.opensocial.model.ApplicationData; +import org.apache.rave.portal.model.ApplicationData; +import org.apache.rave.portal.model.impl.ApplicationDataImpl; import org.apache.rave.portal.model.Person; -import org.apache.rave.opensocial.repository.ApplicationDataRepository; +import org.apache.rave.portal.repository.ApplicationDataRepository; import org.apache.rave.opensocial.service.impl.DefaultAppDataService; +import org.apache.rave.portal.model.impl.PersonImpl; import org.apache.rave.service.LockService; import org.apache.shindig.auth.SecurityToken; import org.apache.shindig.protocol.DataCollection; @@ -61,7 +63,7 @@ public class AppDataServiceTest { private Map<String, String> validApplicationDataMap; private ApplicationData validApplicationData; - private Person validPerson; + private org.apache.rave.portal.model.Person validPerson; @Before public void setup() { @@ -74,11 +76,11 @@ public class AppDataServiceTest { validApplicationDataMap.put("color", "blue"); validApplicationDataMap.put("speed", "fast"); validApplicationDataMap.put("state", "MA"); - validApplicationData = new ApplicationData(VALID_APPLICATION_DATA_ID, VALID_VIEWER_ID, VALID_APPLICATION_ID, + validApplicationData = new ApplicationDataImpl(VALID_APPLICATION_DATA_ID, VALID_VIEWER_ID, VALID_APPLICATION_ID, validApplicationDataMap); - validPerson = new Person(); - validPerson.setEntityId(Long.valueOf(VALID_VIEWER_ID)); + validPerson = new PersonImpl(); + validPerson.setUsername(VALID_VIEWER_ID); } @Test @@ -162,7 +164,7 @@ public class AppDataServiceTest { @Test public void deletePersonData_validRequest_emptyApplicationData() throws Exception { - ApplicationData applicationData = new ApplicationData(); + ApplicationData applicationData = new ApplicationDataImpl(); testDeletePersonDataNoAppDataExpected(applicationData); } @@ -305,11 +307,11 @@ public class AppDataServiceTest { appDataService.deletePersonData(userId, groupId, VALID_APPLICATION_ID, fieldsToDelete, securityToken); - ApplicationData expectedApplicationData = new ApplicationData(applicationData.getEntityId(), + ApplicationData expectedApplicationData = new ApplicationDataImpl(applicationData.getId(), applicationData.getUserId(), applicationData.getAppUrl(), expectedApplicationDataAfterDelete); ApplicationData actualApplicationData = capturedApplicationData.getValue(); - assertEquals(expectedApplicationData.getEntityId(), actualApplicationData.getEntityId()); + assertEquals(expectedApplicationData.getId(), actualApplicationData.getId()); assertEquals(expectedApplicationData.getUserId(), actualApplicationData.getUserId()); assertEquals(expectedApplicationData.getAppUrl(), actualApplicationData.getAppUrl()); assertEquals(expectedApplicationData.getData(), actualApplicationData.getData()); @@ -365,13 +367,13 @@ public class AppDataServiceTest { appDataService.updatePersonData(userId, groupId, VALID_APPLICATION_ID, fields, values, securityToken); - ApplicationData expectedApplicationData = applicationData == null ? new ApplicationData(null, VALID_USER_ID, + ApplicationDataImpl expectedApplicationData = applicationData == null ? new ApplicationDataImpl(null, VALID_USER_ID, VALID_APPLICATION_ID, expectedApplicationDataAfterUpdate) : - new ApplicationData(applicationData.getEntityId(), applicationData.getUserId(), + new ApplicationDataImpl(applicationData.getId(), applicationData.getUserId(), applicationData.getAppUrl(), expectedApplicationDataAfterUpdate); ApplicationData actualApplicationData = capturedApplicationData.getValue(); - assertEquals(expectedApplicationData.getEntityId(), actualApplicationData.getEntityId()); + assertEquals(expectedApplicationData.getId(), actualApplicationData.getId()); assertEquals(expectedApplicationData.getUserId(), actualApplicationData.getUserId()); assertEquals(expectedApplicationData.getAppUrl(), actualApplicationData.getAppUrl()); assertEquals(expectedApplicationData.getData(), actualApplicationData.getData()); @@ -390,8 +392,8 @@ public class AppDataServiceTest { private List<String> convertPeopleToUserIds(List<Person> people) { List<String> ids = new ArrayList<String>(people.size()); - for (Person person : people) { - ids.add(String.valueOf(person.getEntityId())); + for (org.apache.rave.portal.model.Person person : people) { + ids.add(String.valueOf(person.getUsername())); } return ids; } Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java Tue Jun 26 18:18:57 2012 @@ -22,24 +22,22 @@ package org.apache.rave.opensocial.servi import org.apache.rave.exception.NotSupportedException; import org.apache.rave.opensocial.service.impl.FieldRestrictingPerson; -import org.apache.rave.portal.model.*; +import org.apache.rave.portal.model.PersonProperty; +import org.apache.rave.portal.model.impl.AddressImpl; +import org.apache.rave.portal.model.impl.PersonImpl; +import org.apache.rave.portal.model.impl.PersonPropertyImpl; import org.apache.rave.portal.model.util.ModelUtils; import org.apache.shindig.protocol.model.EnumImpl; -import org.apache.shindig.social.core.model.AddressImpl; import org.apache.shindig.social.core.model.BodyTypeImpl; import org.apache.shindig.social.core.model.UrlImpl; import org.apache.shindig.social.opensocial.model.*; -import org.apache.shindig.social.opensocial.model.Address; -import org.apache.shindig.social.opensocial.model.Person; import org.junit.Test; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; @@ -87,7 +85,7 @@ public class FieldRestrictingPersonTest @Test public void getId() { Person p = new FieldRestrictingPerson(getTestPerson(), null); - assertThat(p.getId(), is(equalTo(ID))); + assertThat(p.getId(), is(equalTo(USERNAME))); } @Test public void getDisplayName() { @@ -303,19 +301,19 @@ public class FieldRestrictingPersonTest Person p = new FieldRestrictingPerson(getTestPerson(), getFieldSet(Person.Field.LIVING_ARRANGEMENT)); assertThat(p.getLivingArrangement(), is(nullValue())); } - + @Test public void getLookingFor_set() { Person p = new FieldRestrictingPerson(getTestPerson(), getFieldSet(Person.Field.LOOKING_FOR)); assertThat(p.getLookingFor().size(), is(equalTo(1))); } - + @Test public void getMovies_set() { Person p = new FieldRestrictingPerson(getTestPerson(), getFieldSet(Person.Field.MOVIES)); assertThat(p.getMovies().isEmpty(), is(true)); } - + @Test public void getMusic_set() { Person p = new FieldRestrictingPerson(getTestPerson(), getFieldSet(Person.Field.MUSIC)); @@ -485,17 +483,17 @@ public class FieldRestrictingPersonTest public void setMovies() { new FieldRestrictingPerson(null, null).setMovies(new ArrayList<String>()); } - + @Test(expected = NotSupportedException.class) public void setLookingFor() { new FieldRestrictingPerson(null, null).setLookingFor(new ArrayList<org.apache.shindig.protocol.model.Enum<LookingFor>>()); } - + @Test(expected = NotSupportedException.class) public void setLivingArrangement() { new FieldRestrictingPerson(null, null).setLivingArrangement(SUFFIX); } - + @Test(expected = NotSupportedException.class) public void setUpdated() { new FieldRestrictingPerson(null, null).setUpdated(new Date()); @@ -583,7 +581,7 @@ public class FieldRestrictingPersonTest @Test(expected = NotSupportedException.class) public void setCurrentLocation() { - new FieldRestrictingPerson(null, null).setCurrentLocation(new AddressImpl()); + new FieldRestrictingPerson(null, null).setCurrentLocation(new org.apache.shindig.social.core.model.AddressImpl()); } @Test(expected = NotSupportedException.class) @@ -622,8 +620,7 @@ public class FieldRestrictingPersonTest } private org.apache.rave.portal.model.Person getTestPerson() { - org.apache.rave.portal.model.Person person = new org.apache.rave.portal.model.Person(); - person.setEntityId(1L); + org.apache.rave.portal.model.Person person = new PersonImpl(); person.setUsername(USERNAME); person.setAboutMe(ABOUT_ME); person.setAdditionalName(ADDITIONAL_NAME); @@ -636,25 +633,25 @@ public class FieldRestrictingPersonTest person.setPreferredName(PREFERRED_NAME); person.setStatus(STATUS); List<PersonProperty> properties = new ArrayList<PersonProperty>(); - properties.add(new PersonProperty(1L, "gender", Person.Gender.female.toString(), null, "", false)); - properties.add(new PersonProperty(1L, "drinker", Drinker.HEAVILY.toString(), null, "", false)); - properties.add(new PersonProperty(1L, "age", AGE.toString(), null, "", false)); - properties.add(new PersonProperty(1L, "birthday", BIRTHDAY_STRING, null, "", false)); - properties.add(new PersonProperty(1L, "bodyType", BODY_BUILD, null, "build", false)); - properties.add(new PersonProperty(1L, "bodyType", BODY_EYE_COLOR, null, "eyeColor", false)); - properties.add(new PersonProperty(1L, "bodyType", "25.24", null, "height", false)); - properties.add(new PersonProperty(1L, "ims", IM_1, null, IM_PROVIDER_1, true)); - properties.add(new PersonProperty(1L, "ims", IM_2, null, IM_PROVIDER_2, false)); - properties.add(new PersonProperty(1L, "emails", E_MAIL_ADDRESS_2, null, "personal", false)); - properties.add(new PersonProperty(1L, "emails", E_MAIL_ADDRESS_3, null, "junk", true)); - properties.add(new PersonProperty(1L, "activities", ACTIVITY_1, null, "", false)); - properties.add(new PersonProperty(1L, "activities", ACTIVITY_2, null, "", false)); - properties.add(new PersonProperty(1L, "profileSong", LINK_VALUE, LINK_TEXT, null, false)); - properties.add(new PersonProperty(1L, "lookingFor", LookingFor.FRIENDS.toString(), null, null, false)); - properties.add(new PersonProperty(1L, "currentLocation", QUALIFIER, null, null, null)); - properties.add(new PersonProperty(1L, "account", IM_1, "1", IM_PROVIDER_1, false)); + properties.add(new PersonPropertyImpl(1L, "gender", Person.Gender.female.toString(), null, "", false)); + properties.add(new PersonPropertyImpl(1L, "drinker", Drinker.HEAVILY.toString(), null, "", false)); + properties.add(new PersonPropertyImpl(1L, "age", AGE.toString(), null, "", false)); + properties.add(new PersonPropertyImpl(1L, "birthday", BIRTHDAY_STRING, null, "", false)); + properties.add(new PersonPropertyImpl(1L, "bodyType", BODY_BUILD, null, "build", false)); + properties.add(new PersonPropertyImpl(1L, "bodyType", BODY_EYE_COLOR, null, "eyeColor", false)); + properties.add(new PersonPropertyImpl(1L, "bodyType", "25.24", null, "height", false)); + properties.add(new PersonPropertyImpl(1L, "ims", IM_1, null, IM_PROVIDER_1, true)); + properties.add(new PersonPropertyImpl(1L, "ims", IM_2, null, IM_PROVIDER_2, false)); + properties.add(new PersonPropertyImpl(1L, "emails", E_MAIL_ADDRESS_2, null, "personal", false)); + properties.add(new PersonPropertyImpl(1L, "emails", E_MAIL_ADDRESS_3, null, "junk", true)); + properties.add(new PersonPropertyImpl(1L, "activities", ACTIVITY_1, null, "", false)); + properties.add(new PersonPropertyImpl(1L, "activities", ACTIVITY_2, null, "", false)); + properties.add(new PersonPropertyImpl(1L, "profileSong", LINK_VALUE, LINK_TEXT, null, false)); + properties.add(new PersonPropertyImpl(1L, "lookingFor", LookingFor.FRIENDS.toString(), null, null, false)); + properties.add(new PersonPropertyImpl(1L, "currentLocation", QUALIFIER, null, null, null)); + properties.add(new PersonPropertyImpl(1L, "account", IM_1, "1", IM_PROVIDER_1, false)); person.setProperties(properties); - org.apache.rave.portal.model.Address address = new org.apache.rave.portal.model.Address(); + org.apache.rave.portal.model.Address address = new AddressImpl(); address.setCountry(COUNTRY); address.setLatitude(LATITUDE); address.setLongitude(LONGITUDE); @@ -664,7 +661,7 @@ public class FieldRestrictingPersonTest address.setStreetAddress(STREET); address.setQualifier(QUALIFIER); List<org.apache.rave.portal.model.Address> addresses = new ArrayList<org.apache.rave.portal.model.Address>(); - addresses.add(new org.apache.rave.portal.model.Address()); + addresses.add(new AddressImpl()); addresses.add(address); person.setAddresses(addresses); Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java Tue Jun 26 18:18:57 2012 @@ -20,9 +20,10 @@ package org.apache.rave.opensocial.service; import com.google.common.collect.Lists; -import org.apache.rave.opensocial.repository.PersonRepository; +import org.apache.rave.opensocial.repository.OpenSocialPersonRepository; import org.apache.rave.opensocial.service.impl.DefaultPersonService; import org.apache.rave.opensocial.service.impl.FieldRestrictingPerson; +import org.apache.rave.portal.model.impl.PersonImpl; import org.apache.shindig.auth.SecurityToken; import org.apache.shindig.protocol.ProtocolException; import org.apache.shindig.protocol.RestfulCollection; @@ -42,15 +43,9 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; +import static org.easymock.EasyMock.*; +import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; public class PersonServiceTest { @@ -62,13 +57,13 @@ public class PersonServiceTest { private static final String ID_1 = "1234"; private static final String GROUP_ID = "BOO"; private PersonService service; - private PersonRepository repository; + private OpenSocialPersonRepository repository; private SecurityToken token; @Before public void setup() { token = createNiceMock(SecurityToken.class); - repository = createNiceMock(PersonRepository.class); + repository = createNiceMock(OpenSocialPersonRepository.class); service = new DefaultPersonService(repository); } @@ -507,16 +502,14 @@ public class PersonServiceTest { } private org.apache.rave.portal.model.Person getDbPerson() { - org.apache.rave.portal.model.Person dbPerson = new org.apache.rave.portal.model.Person(); - dbPerson.setEntityId(Long.parseLong(ID_1)); + PersonImpl dbPerson = new PersonImpl(); dbPerson.setUsername(ID_1); dbPerson.setDisplayName(DISPLAY_NAME); return dbPerson; } private org.apache.rave.portal.model.Person getDbPerson(Long id) { - org.apache.rave.portal.model.Person dbPerson = new org.apache.rave.portal.model.Person(); - dbPerson.setEntityId(id); + PersonImpl dbPerson = new PersonImpl(); dbPerson.setUsername(id.toString()); dbPerson.setDisplayName(DISPLAY_NAME); return dbPerson; Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml Tue Jun 26 18:18:57 2012 @@ -41,52 +41,27 @@ <!-- enable the use of the @AspectJ style of Spring AOP --> <aop:aspectj-autoproxy /> - <context:component-scan base-package="org.apache.rave.commoncontainer" annotation-config="true"/> +<!-- <context:component-scan base-package="org.apache.rave.commoncontainer" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.gadgets" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.inject" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.portal.model" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.portal.repository" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.opensocial" annotation-config="true"/> - <context:component-scan base-package="org.apache.rave.service" annotation-config="true"/> - - <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager"> - <property name="entityManagerFactory" ref="entityManagerFactory"/> + <context:component-scan base-package="org.apache.rave.service" annotation-config="true"/>--> + <bean id="mockPersonRepo" class="org.easymock.EasyMock" factory-method="createNiceMock"> + <constructor-arg value="org.apache.rave.opensocial.repository.OpenSocialPersonRepository"/> </bean> - <tx:annotation-driven transaction-manager="transactionManager"/> - - <bean id="entityManagerFactory" - class="org.apache.rave.persistence.jpa.PopulatedLocalContainerEntityManagerFactory"> - <property name="persistenceUnitName" value="raveShindigPersistenceUnit"/> - <property name="dataSource" ref="dataSource"/> - <property name="populator" ref="dataSourcePopulator"/> - <property name="jpaVendorAdapter"> - <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter" - p:databasePlatform="${rave-shindig.jpaVendorAdapter.databasePlatform}" - p:database="${rave-shindig.jpaVendorAdapter.database}" - p:showSql="${rave-shindig.jpaVendorAdapter.showSql}"/> - </property> - <property name="jpaPropertyMap"> - <map> - <entry key="openjpa.Log" value="${rave-shindig.openjpa.Log}"/> - <entry key="openjpa.RuntimeUnenhancedClasses" value="${rave-shindig.openjpa.RuntimeUnenhancedClasses}"/> - <entry key="openjpa.jdbc.SynchronizeMappings" value="${rave-shindig.openjpa.jdbc.SynchronizeMappings}"/> - <entry key="openjpa.jdbc.MappingDefaults" value="${rave-shindig.openjpa.jdbc.MappingDefaults}"/> - </map> - </property> - </bean> - - <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> - <property name="url" value="${rave-shindig.dataSource.url}"/> - <property name="driverClassName" value="${rave-shindig.dataSource.driver}"/> - <property name="username" value="${rave-shindig.dataSource.username}"/> - <property name="password" value="${rave-shindig.dataSource.password}"/> + <bean id="personService" class="org.apache.rave.opensocial.service.impl.DefaultPersonService"> + <constructor-arg name="repository" ref="mockPersonRepo" /> </bean> + <bean id="springBindingModule" class="org.apache.rave.inject.SpringBindingModule" /> + <!-- <bean id="oAuthStore" class="org.apache.rave.gadgets.oauth.inject.DefaultOAuthStore"> <constructor-arg name="defaultCallbackUrl" value="${shindig.signing.global-callback-url}"/> <constructor-arg name="pathToPrivateKey" value="${shindig.signing.key-file}"/> <constructor-arg name="privateKeyName" value="${shindig.signing.key-name}"/> - </bean> + </bean>--> </beans> Propchange: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 26 18:18:57 2012 @@ -1,3 +1,4 @@ .settings target .project +*.iml Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml Tue Jun 26 18:18:57 2012 @@ -59,6 +59,10 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.rave</groupId> + <artifactId>rave-jpa</artifactId> + </dependency> + <dependency> <groupId>org.apache.shindig</groupId> <artifactId>shindig-server</artifactId> <type>war</type> Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml Tue Jun 26 18:18:57 2012 @@ -58,7 +58,7 @@ <bean id="entityManagerFactory" class="org.apache.rave.persistence.jpa.PopulatedLocalContainerEntityManagerFactory"> - <property name="persistenceUnitName" value="raveShindigPersistenceUnit"/> + <property name="persistenceUnitName" value="ravePersistenceUnit"/> <property name="dataSource" ref="dataSource"/> <property name="populator" ref="dataSourcePopulator"/> <property name="jpaVendorAdapter"> Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java (original) +++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java Tue Jun 26 18:18:57 2012 @@ -19,7 +19,7 @@ package org.apache.rave.provider.w3c.service.impl; -import org.apache.rave.portal.model.Widget; +import org.apache.rave.portal.model.impl.WidgetImpl; /** * Extended version of Widget with some additional W3C metadata. @@ -28,7 +28,7 @@ import org.apache.rave.portal.model.Widg * Rave data model classes. * */ -public class W3CWidget extends Widget{ +public class W3CWidget extends WidgetImpl { private static final long serialVersionUID = 6211520730435963518L; Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java (original) +++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java Tue Jun 26 18:18:57 2012 @@ -66,12 +66,12 @@ public class WookieWidgetService impleme Collection<org.apache.wookie.connector.framework.Widget> widgets = connectorService.getAvailableWidgets().values(); ArrayList<Widget> raveWidgets = new ArrayList<Widget>(); for (org.apache.wookie.connector.framework.Widget wookieWidget: widgets){ - Widget widget = new Widget(); + Widget widget = new W3CWidget(); widget.setUrl(wookieWidget.getIdentifier()); widget.setDescription(wookieWidget.getDescription()); - widget.setTitle(wookieWidget.getName()); + widget.setTitle(wookieWidget.getTitle()); widget.setThumbnailUrl(wookieWidget.getIcon().toString()); - widget.setAuthor(wookieWidget.getAuthor()); + //widget.setAuthor(wookieWidget.getAuthor()); raveWidgets.add(widget); } return raveWidgets.toArray(new Widget[raveWidgets.size()]); Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java (original) +++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java Tue Jun 26 18:18:57 2012 @@ -100,7 +100,7 @@ public class W3cWidgetRenderer implement scriptManager.registerScriptBlock(widgetScript, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, context); logger.debug("Gadget Script Data: " + widgetScript); - return String.format(MARKUP, item.getEntityId()); + return String.format(MARKUP, item.getId()); } /** @@ -114,7 +114,7 @@ public class W3cWidgetRenderer implement // // For the shared data key we use the RegionWidget entity ID. // - String sharedDataKey = String.valueOf(item.getEntityId()); + String sharedDataKey = String.valueOf(item.getId()); // // Get the Rave Widget for this regionWidget instance @@ -150,14 +150,14 @@ public class W3cWidgetRenderer implement // Construct and return script block // return String.format(SCRIPT_BLOCK, - item.getRegion().getEntityId(), + item.getRegion().getId(), WIDGET_TYPE, - item.getEntityId(), + item.getId(), contextualizedWidget.getUrl(), height, width, item.isCollapsed(), - item.getWidget().getEntityId(), + item.getWidget().getId(), item.isLocked(), item.isHideChrome()); } Modified: rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java (original) +++ rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java Tue Jun 26 18:18:57 2012 @@ -20,6 +20,7 @@ package org.apache.rave.provider.w3c.service.impl; import org.apache.rave.portal.model.Widget; +import org.apache.rave.portal.model.impl.WidgetImpl; import org.apache.rave.portal.service.WidgetMetadataResolver; import org.apache.rave.provider.w3c.repository.W3CWidgetMetadataRepository; import org.apache.wookie.connector.framework.WookieConnectorException; @@ -28,12 +29,8 @@ import org.junit.Test; import java.io.IOException; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; public class WookieWidgetMetadataResolverTest { private W3CWidgetMetadataRepository wookieWidgetMetadataRepository; @@ -52,7 +49,7 @@ public class WookieWidgetMetadataResolve wookieWidgetMetadataRepository = createNiceMock(W3CWidgetMetadataRepository.class); widgetMetadataResolver = new WookieWidgetMetadataResolver(widgetService); - TEST_WIDGET = new Widget(); + TEST_WIDGET = new WidgetImpl(); TEST_WIDGET.setTitle("freeder"); TEST_WIDGET.setUrl("http://wookie.apache.org/widgets/freeder";); TEST_WIDGET.setDescription("An RSS reader widget optimised for small screens or desktop widgets."); Modified: rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java (original) +++ rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java Tue Jun 26 18:18:57 2012 @@ -19,19 +19,15 @@ package org.apache.rave.provider.w3c.web.renderer; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; - import org.apache.rave.exception.NotSupportedException; import org.apache.rave.portal.model.Region; import org.apache.rave.portal.model.RegionWidget; import org.apache.rave.portal.model.User; import org.apache.rave.portal.model.Widget; +import org.apache.rave.portal.model.impl.RegionImpl; +import org.apache.rave.portal.model.impl.RegionWidgetImpl; +import org.apache.rave.portal.model.impl.UserImpl; +import org.apache.rave.portal.model.impl.WidgetImpl; import org.apache.rave.portal.service.UserService; import org.apache.rave.portal.service.WidgetProviderService; import org.apache.rave.portal.web.renderer.Renderer; @@ -42,6 +38,12 @@ import org.apache.rave.provider.w3c.serv import org.junit.Before; import org.junit.Test; +import static org.easymock.EasyMock.*; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; + /* */ public class W3cWidgetRendererTest { @@ -56,6 +58,7 @@ public class W3cWidgetRendererTest { @Before public void setup() { + renderContext = new RenderContext(); wookieService = createNiceMock(WidgetProviderService.class); userService = createNiceMock(UserService.class); @@ -70,23 +73,23 @@ public class W3cWidgetRendererTest { @Test public void render_valid() { - User user = new User(9999L, "testUser"); + User user = new UserImpl(9999L, "testUser"); expect(userService.getAuthenticatedUser()).andReturn(user); replay(userService); W3CWidget w = new W3CWidget(); w.setType(Constants.WIDGET_TYPE); w.setUrl("http://example.com/widgets/1";); - Region region = new Region(1L); - RegionWidget rw = new RegionWidget(); - rw.setEntityId(1L); + Region region = new RegionImpl(1L); + RegionWidget rw = new RegionWidgetImpl(); + rw.setId(1L); rw.setWidget(w); rw.setRegion(region); W3CWidget wookieWidget = new W3CWidget(); wookieWidget.setUrl(VALID_WIDGET_INSTANCE_URL); - expect(wookieService.getWidget(user, rw.getEntityId().toString(), w)).andReturn(wookieWidget); + expect(wookieService.getWidget(eq(user), eq(rw.getId().toString()), isA(Widget.class))).andReturn(wookieWidget); replay(wookieService); String placeholder = renderer.render(rw, renderContext); @@ -95,11 +98,11 @@ public class W3cWidgetRendererTest { @Test(expected = NotSupportedException.class) public void render_invalid() { - Widget w = new Widget(); + Widget w = new WidgetImpl(); w.setType("NONE"); w.setUrl(VALID_WIDGET_URL); - RegionWidget rw = new RegionWidget(); - rw.setEntityId(1L); + RegionWidget rw = new RegionWidgetImpl(); + rw.setId(1L); rw.setWidget(w); RenderContext renderContext = createNiceMock(RenderContext.class);
