[jboss-cvs] JBossAS SVN: r102590 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-domain/src/test/java/org/jboss/snowdrop/samples/sportsclub/domain and 1 other directories.

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

Author: marius.bogoevici
Date: 2010-03-18 17:05:13 -0400 (Thu, 18 Mar 2010)
New Revision: 102590

Modified:
   projects/snowdrop/examples/trunk/sportsclub/pom.xml
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/test/java/org/jboss/snowdrop/samples/sportsclub/domain/TestAccount.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/pom.xml
Log:
Creating separate profiles for Spring 2.5 and Spring 3 (Spring 3 requires a different version of JUnit too)

Modified: projects/snowdrop/examples/trunk/sportsclub/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/pom.xml	2010-03-18 21:00:22 UTC (rev 102589)
+++ projects/snowdrop/examples/trunk/sportsclub/pom.xml	2010-03-18 21:05:13 UTC (rev 102590)
@@ -28,7 +28,6 @@
 
 
     <properties>
-        <spring.version>2.5.6.SEC01</spring.version>
         <snowdrop.version>1.0.1-CR1</snowdrop.version>
         <commons-logging.version>1.1.1</commons-logging.version>
     </properties>
@@ -159,7 +158,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.4</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
 
@@ -345,4 +344,23 @@
         </pluginRepository>
     </pluginRepositories>
 
+    <profiles>
+        <profile>
+            <id>spring-2.5</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.version>2.5.6.SEC01</spring.version>
+                <junit.version>4.4</junit.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>spring-3</id>
+            <properties>
+                <spring.version>3.0.1.RELEASE</spring.version>
+                <junit.version>4.6</junit.version>
+            </properties>
+        </profile>
+    </profiles>
 </project>

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/test/java/org/jboss/snowdrop/samples/sportsclub/domain/TestAccount.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/test/java/org/jboss/snowdrop/samples/sportsclub/domain/TestAccount.java	2010-03-18 21:00:22 UTC (rev 102589)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/test/java/org/jboss/snowdrop/samples/sportsclub/domain/TestAccount.java	2010-03-18 21:05:13 UTC (rev 102590)
@@ -3,7 +3,6 @@
 import java.math.BigDecimal;
 import java.util.Date;
 
-import org.hamcrest.Description;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.BillingType;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Membership;
@@ -12,8 +11,6 @@
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.TimeInterval;
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.matchers.TypeSafeMatcher;
-
 /**
  * @author Marius Bogoevici
  */
@@ -63,7 +60,7 @@
 
       Date currentDate = new Date();
       final TimeInterval timeInterval = account.getBillingPeriodFor(currentDate);
-      Assert.assertThat(currentDate, new IsWithinTimeInterval(timeInterval));
+       Assert.assertTrue(timeInterval.contains(currentDate));
    }
 
    @Test
@@ -73,7 +70,8 @@
 
       Date currentDate = new Date();
       final TimeInterval timeInterval = account.getBillingPeriodFor(currentDate);
-      Assert.assertThat(currentDate, new IsWithinTimeInterval(timeInterval));
+       Assert.assertTrue(timeInterval.contains(currentDate));
+
    }
 
    @Test
@@ -83,7 +81,7 @@
 
       Date currentDate = new Date();
       final TimeInterval timeInterval = account.getBillingPeriodFor(currentDate);
-      Assert.assertThat(currentDate, new IsWithinTimeInterval(timeInterval));
+      Assert.assertTrue(timeInterval.contains(currentDate));
    }
 
    private Account createAccount(BillingType billingType, BigDecimal amount)
@@ -103,24 +101,4 @@
       return account;
    }
 
-   private static class IsWithinTimeInterval extends TypeSafeMatcher<Date>
-   {
-      private final TimeInterval timeInterval;
-
-      public IsWithinTimeInterval(TimeInterval timeInterval)
-      {
-         this.timeInterval = timeInterval;
-      }
-
-      public void describeTo(Description description)
-      {
-         description.appendText("TimeInterval from: " + timeInterval.getStartDate() + " to " + timeInterval.getEndDate());
-      }
-
-      @Override
-      public boolean matchesSafely(Date item)
-      {
-         return timeInterval.contains(item);
-      }
-   }
 }

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/pom.xml	2010-03-18 21:00:22 UTC (rev 102589)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/pom.xml	2010-03-18 21:05:13 UTC (rev 102590)
@@ -96,6 +96,11 @@
             <version>3.11.0.GA</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
     </dependencies>
 
     <build>