work

Author: thomaswoehlke

src/test/java/org/woehlke/greenshop/frontend/CatalogControllerTest.java

@@ -14,15 +14,14 @@
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 
 @WebAppConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:/servlet-context.xml")
-@TransactionConfiguration(transactionManager="transactionManager", defaultRollback=false)
+//@TransactionConfiguration(transactionManager="transactionManager", defaultRollback=false)
 @Transactional
 public class CatalogControllerTest {
 

src/test/java/org/woehlke/greenshop/oodm/catalog/repositories/ProductDescriptionRepositoryTest.java

@@ -62,7 +62,7 @@ public void findByLanguageOrderByProductDateAddedTest() throws Exception {
 	@Test
 	public void findByManufacturerTest()  throws Exception {
 		Language language=languageRepository.findByCode("en");
-		Manufacturer manufacturer =  manufacturerRepository.findOne(4L);
+		Manufacturer manufacturer =  manufacturerRepository.getOne(4L);
 		List<ProductDescription> page = productDescriptionRepositoryDao.findByManufacturer(manufacturer, language);
 		logger.info("------------------------------------------------------");
 		for (ProductDescription p : page){