SGF-163 - made repository.findAll() consistent with count() for client regions

This commit is contained in:
David Turanski
2013-03-07 16:45:58 -05:00
parent 4a6021fbc3
commit 0163b43dd3
7 changed files with 164 additions and 34 deletions

View File

@@ -43,40 +43,41 @@ import com.gemstone.gemfire.cache.client.Pool;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("/org/springframework/data/gemfire/client/datasource-client.xml")
public class GemFireDataSourceTest {
@Autowired
@Autowired
ApplicationContext ctx;
@BeforeClass
public static void startUp() throws Exception {
ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " "
ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " "
+ "/org/springframework/data/gemfire/client/datasource-server.xml");
}
@SuppressWarnings("unused")
@Test
public void testServerDataSource() {
Cache cache = ctx.getBean("gemfireCache",Cache.class);
Pool pool = ctx.getBean("gemfirePool",Pool.class);
Cache cache = ctx.getBean("gemfireCache", Cache.class);
Pool pool = ctx.getBean("gemfirePool", Pool.class);
assertEquals(true, pool.getSubscriptionEnabled());
String regions[] = ctx.getBeanNamesForType(Region.class);
List<String> regionList = Arrays.asList(regions);
assertTrue(regionList.contains("r1"));
assertTrue(regionList.contains("r2"));
assertTrue(regionList.contains("simple"));
Region<?,?> simple = ctx.getBean("simple", Region.class);
Region<?, ?> simple = ctx.getBean("simple", Region.class);
assertEquals(DataPolicy.EMPTY, simple.getAttributes().getDataPolicy());
}
@Test
public void testRepositoryCreated() {
PersonRepository repo = ctx.getBean(PersonRepository.class);
Person dave = new Person(1L,"Dave","Mathhews");
Person dave = new Person(1L, "Dave", "Mathhews");
repo.save(dave);
Person saved = repo.findOne(1L);
assertEquals("Dave",saved.getFirstname());
Person saved = repo.findOne(1L);
assertEquals("Dave", saved.getFirstname());
}
@AfterClass
public static void cleanUp() {
ForkUtil.sendSignal();

View File

@@ -0,0 +1,57 @@
/*
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.springframework.data.gemfire.repository.config;
import static org.junit.Assert.assertEquals;
import java.util.Collection;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.gemfire.ForkUtil;
import org.springframework.data.gemfire.fork.SpringCacheServerProcess;
import org.springframework.data.gemfire.repository.sample.Person;
import org.springframework.data.gemfire.repository.sample.PersonRepository;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author David Turanski
*
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class RepositoryClientRegionTests {
@Autowired
PersonRepository repository;
@BeforeClass
public static void startUp() throws Exception {
ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " "
+ "/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-server-context.xml");
}
@Test
public void testFindAllAndCount() {
assertEquals(2, repository.count());
assertEquals(2, ((Collection<Person>) repository.findAll()).size());
}
@AfterClass
public static void cleanUp() {
ForkUtil.sendSignal();
}
}

View File

@@ -0,0 +1,43 @@
/*
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.springframework.data.gemfire.repository.sample;
import javax.annotation.Resource;
import org.springframework.beans.factory.InitializingBean;
import com.gemstone.gemfire.cache.Region;
/**
* @author David Turanski
*
*/
public class RegionPopulator implements InitializingBean {
@Resource(name="region")
Region<Object,Object> region;
/* (non-Javadoc)
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() throws Exception {
region.put(1L,new Person(1L,"first1", "last1"));
region.put(2L,new Person(2L,"first2", "last2"));
}
public void setRegion(Region<Object,Object> region) {
this.region=region;
}
}