junit handling improved

Change-Id: I480e31457d72512b6d16a6570e3f1a329c4b4fb2 Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>
SAP-archive · Nov 29, 2015 · e18afe1 · e18afe1
1 parent 0740257
commit e18afe1
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/enterprise-granny-client/pom.xml b/enterprise-granny-client/pom.xml
@@ -205,8 +205,8 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.1</version>
+			<artifactId>javax.servlet.jsp-api</artifactId>
+			<version>2.3.2-b02</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/...t/src/test/java/com/sap/hana/cloud/samples/granny/client/srv/test/TestAddressbookSrv.java b/...t/src/test/java/com/sap/hana/cloud/samples/granny/client/srv/test/TestAddressbookSrv.java
@@ -13,6 +13,11 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.sap.hana.cloud.samples.granny.api.ContactFacade;
 import com.sap.hana.cloud.samples.granny.model.Address;
@@ -28,6 +33,9 @@
 /**
  * Tests for the {@link ContactFacade} class.  
  */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ActiveProfiles(profiles = "test")
+@Ignore("As it assumes the Addressbook Service to run on a hardcoded port on localhost!")
 public class TestAddressbookSrv
 {
 	static String endPoint = null;
@@ -72,7 +80,7 @@ public void tearDown() throws Exception
 	/**
 	 * Tests getting all contacts
 	 */
-	//@Test
+	@Test
 	public void testGetContacts() 
 	{
 
@@ -85,7 +93,7 @@ public void testGetContacts()
 	/**
 	 * Tests creating a contact.
 	 */
-	//@Test
+	@Test
 	public void testCRUD() 
 	{	
 		// create test data
@@ -123,7 +131,7 @@ public void testCRUD()
 	 * 
 	 * @see http://www.historyrundown.com/top-5-people-with-the-longest-names/
 	 */
-	//@Test
+	@Test
 	public void testDataValidation() 
 	{
 

diff --git a/enterprise-granny-service/.gitignore b/enterprise-granny-service/.gitignore
@@ -1,2 +1,3 @@
 /target/
 /.settings/
+/derby.log
diff --git a/enterprise-granny-service/pom.xml b/enterprise-granny-service/pom.xml
@@ -274,8 +274,8 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.1</version>
+			<artifactId>javax.servlet.jsp-api</artifactId>
+			<version>2.3.2-b02</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -343,7 +343,7 @@
 		<dependency>
 			<groupId>org.glassfish</groupId>
 			<artifactId>javax.el</artifactId>
-			<version>3.0.1-b05</version>
+			<version>3.0.1-b08</version>
 		</dependency>
 
 		<!-- Google Phone Lib -->

diff --git a/...se-granny-service/src/test/java/com/sap/hana/cloud/samples/granny/dao/TestContactDAO.java b/...se-granny-service/src/test/java/com/sap/hana/cloud/samples/granny/dao/TestContactDAO.java
@@ -35,10 +35,9 @@
 /**
  * Tests for the {@link ContactDAO} class.  
  */
-@ContextConfiguration("classpath:/META-INF/spring/app-context.xml")
+@ContextConfiguration("classpath:/META-INF/spring/spring-persistence-config.xml")
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles(profiles = "test")
-@Ignore("does not work due to missing spring app-context.")
 public class TestContactDAO
 {
 	@Autowired

diff --git a/...ranny-service/src/test/java/com/sap/hana/cloud/samples/granny/dao/TestContactService.java b/...ranny-service/src/test/java/com/sap/hana/cloud/samples/granny/dao/TestContactService.java
@@ -7,7 +7,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,10 +24,9 @@
 /**
  * Tests for the {@link ContactService} class.  
  */
-@ContextConfiguration("classpath:/META-INF/spring/app-context.xml")
+@ContextConfiguration("classpath:/META-INF/spring/spring-persistence-config.xml")
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles(profiles = "test")
-@Ignore("does not work due to missing spring app-context.")
 public class TestContactService
 {
 	@Autowired

diff --git a/...ce/src/test/java/com/sap/hana/cloud/samples/granny/dao/ValidPhoneNumberValidatorTest.java b/...ce/src/test/java/com/sap/hana/cloud/samples/granny/dao/ValidPhoneNumberValidatorTest.java
@@ -10,7 +10,6 @@
 import javax.validation.ValidatorFactory;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,10 +26,9 @@
 /**
  * Tests for the {@link ValidPhoneNumberValidator} class.  
  */
-@ContextConfiguration("classpath:/META-INF/spring/app-context.xml")
+@ContextConfiguration("classpath:/META-INF/spring/spring-persistence-config.xml")
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles(profiles = "test")
-@Ignore("does not work due to missing spring app-context.")
 public class ValidPhoneNumberValidatorTest
 {