[jboss-cvs] JBossAS SVN: r66608 - in projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src: main/java/org/jboss/example/service/util and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 31 09:22:58 EDT 2007
Author: newtonm
Date: 2007-10-31 09:22:58 -0400 (Wed, 31 Oct 2007)
New Revision: 66608
Added:
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/AgeBasedSalaryStrategy.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/LocationBasedSalaryStrategy.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/SalaryStrategy.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/AgeBasedSalaryTestCase.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/LocationBasedSalaryTestCase.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/SalaryStrategyTestSuite.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/util/
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/util/AgeBasedSalaryTestCase.xml
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/util/LocationBasedSalaryTestCase.xml
Removed:
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/AgeBasedSalaryStrategy.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/LocationBasedSalaryStrategy.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/SalaryStrategy.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/AgeBasedSalaryTestCase.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/LocationBasedSalaryTestCase.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/AgeBasedSalaryTestCase.xml
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/LocationBasedSalaryTestCase.xml
Modified:
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/HRManager.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/HRServiceTestSuite.java
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/HRManagerAgeBasedTestCase.xml
projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/HRManagerLocationBasedTestCase.xml
Log:
Added extra package for clarity.
Deleted: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/AgeBasedSalaryStrategy.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/AgeBasedSalaryStrategy.java 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/AgeBasedSalaryStrategy.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -1,71 +0,0 @@
-package org.jboss.example.service;
-
-import java.util.Calendar;
-
-/**
- * Check that the salary is relative to the employee's age in years.
- */
-public class AgeBasedSalaryStrategy implements SalaryStrategy {
-
- private int minSalary = 5000;
- private int maxSalary = 100000;
-
- public Integer checkSalary(Employee employee, Integer salary) {
-
- Calendar dateOfBirth = Calendar.getInstance();
- dateOfBirth.setTime(employee.getDateOfBirth());
-
- Calendar now = Calendar.getInstance();
-
- if (now.before(dateOfBirth)) {
- throw new IllegalArgumentException("Employee is not born yet!");
- }
-
- int age = now.get(Calendar.YEAR) - dateOfBirth.get(Calendar.YEAR);
-
- // Check if the employee has already had their birthday this year
- if (age > 0) {
- if (now.get(Calendar.MONTH) - dateOfBirth.get(Calendar.MONTH) > 0) {
- age--;
- } else if (now.get(Calendar.MONTH) - dateOfBirth.get(Calendar.MONTH) == 0) {
- if (now.get(Calendar.DAY_OF_MONTH) - dateOfBirth.get(Calendar.DAY_OF_MONTH) > 0 ) {
- age--;
- }
- }
- }
-
- // Set minimum salaries depending on the age of the employee
- if (age >= 21 && age < 30 && salary < 25000) {
- salary = 25000;
- }
-
- if (age >= 30 && age < 50 && salary < 50000) {
- salary = 50000;
- }
-
- // Apply company-wide ranges
- if (salary < minSalary) {
- salary = minSalary;
- } else if (salary > maxSalary) {
- salary = maxSalary;
- }
-
- return salary;
- }
-
- public int getMinSalary() {
- return minSalary;
- }
-
- public void setMinSalary(int minSalary) {
- this.minSalary = minSalary;
- }
-
- public int getMaxSalary() {
- return maxSalary;
- }
-
- public void setMaxSalary(int maxSalary) {
- this.maxSalary = maxSalary;
- }
-}
Modified: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/HRManager.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/HRManager.java 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/HRManager.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -4,6 +4,8 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import org.jboss.example.service.util.SalaryStrategy;
+
/**
* An Manager keeps track of a set of employees and their associated salaries.
*/
Deleted: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/LocationBasedSalaryStrategy.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/LocationBasedSalaryStrategy.java 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/LocationBasedSalaryStrategy.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -1,56 +0,0 @@
-package org.jboss.example.service;
-
-/**
- * Check that the salary is relative to the employee's location.
- */
-public class LocationBasedSalaryStrategy implements SalaryStrategy {
-
- private int minSalary = 5000;
- private int maxSalary = 100000;
-
- private static final int LONDON_MIN_SALARY = 50000;
- private static final int MANCHESTER_MIN_SALARY = 40000;
- private static final int GLASGOW_MIN_SALARY = 30000;
- private static final int BELFAST_MIN_SALARY = 20000;
-
- public Integer checkSalary(Employee employee, Integer salary) {
-
- String city = employee.getAddress().getCity();
-
- // Set minimum salaries depending on the location of the employee
- if (city.equals("London") && salary < LONDON_MIN_SALARY) {
- salary = LONDON_MIN_SALARY;
- } else if (city.equals("Manchester") && salary < MANCHESTER_MIN_SALARY) {
- salary = MANCHESTER_MIN_SALARY;
- } else if (city.equals("Glasgow") && salary < GLASGOW_MIN_SALARY) {
- salary = GLASGOW_MIN_SALARY;
- } else if (city.equals("Belfast") & salary < BELFAST_MIN_SALARY) {
- salary = BELFAST_MIN_SALARY;
- }
-
- // Apply company-wide ranges
- if (salary < minSalary) {
- salary = minSalary;
- } else if (salary > maxSalary) {
- salary = maxSalary;
- }
-
- return salary;
- }
-
- public int getMinSalary() {
- return minSalary;
- }
-
- public void setMinSalary(int minSalary) {
- this.minSalary = minSalary;
- }
-
- public int getMaxSalary() {
- return maxSalary;
- }
-
- public void setMaxSalary(int maxSalary) {
- this.maxSalary = maxSalary;
- }
-}
Deleted: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/SalaryStrategy.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/SalaryStrategy.java 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/SalaryStrategy.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -1,8 +0,0 @@
-package org.jboss.example.service;
-
-public interface SalaryStrategy {
-
- public int getMinSalary();
- public int getMaxSalary();
- public Integer checkSalary(Employee employee, Integer salary);
-}
Copied: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/AgeBasedSalaryStrategy.java (from rev 66603, projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/AgeBasedSalaryStrategy.java)
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/AgeBasedSalaryStrategy.java (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/AgeBasedSalaryStrategy.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -0,0 +1,73 @@
+package org.jboss.example.service.util;
+
+import java.util.Calendar;
+
+import org.jboss.example.service.Employee;
+
+/**
+ * Check that the salary is relative to the employee's age in years.
+ */
+public class AgeBasedSalaryStrategy implements SalaryStrategy {
+
+ private int minSalary = 5000;
+ private int maxSalary = 100000;
+
+ public Integer checkSalary(Employee employee, Integer salary) {
+
+ Calendar dateOfBirth = Calendar.getInstance();
+ dateOfBirth.setTime(employee.getDateOfBirth());
+
+ Calendar now = Calendar.getInstance();
+
+ if (now.before(dateOfBirth)) {
+ throw new IllegalArgumentException("Employee is not born yet!");
+ }
+
+ int age = now.get(Calendar.YEAR) - dateOfBirth.get(Calendar.YEAR);
+
+ // Check if the employee has already had their birthday this year
+ if (age > 0) {
+ if (now.get(Calendar.MONTH) - dateOfBirth.get(Calendar.MONTH) > 0) {
+ age--;
+ } else if (now.get(Calendar.MONTH) - dateOfBirth.get(Calendar.MONTH) == 0) {
+ if (now.get(Calendar.DAY_OF_MONTH) - dateOfBirth.get(Calendar.DAY_OF_MONTH) > 0 ) {
+ age--;
+ }
+ }
+ }
+
+ // Set minimum salaries depending on the age of the employee
+ if (age >= 21 && age < 30 && salary < 25000) {
+ salary = 25000;
+ }
+
+ if (age >= 30 && age < 50 && salary < 50000) {
+ salary = 50000;
+ }
+
+ // Apply company-wide ranges
+ if (salary < minSalary) {
+ salary = minSalary;
+ } else if (salary > maxSalary) {
+ salary = maxSalary;
+ }
+
+ return salary;
+ }
+
+ public int getMinSalary() {
+ return minSalary;
+ }
+
+ public void setMinSalary(int minSalary) {
+ this.minSalary = minSalary;
+ }
+
+ public int getMaxSalary() {
+ return maxSalary;
+ }
+
+ public void setMaxSalary(int maxSalary) {
+ this.maxSalary = maxSalary;
+ }
+}
Copied: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/LocationBasedSalaryStrategy.java (from rev 66603, projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/LocationBasedSalaryStrategy.java)
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/LocationBasedSalaryStrategy.java (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/LocationBasedSalaryStrategy.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -0,0 +1,58 @@
+package org.jboss.example.service.util;
+
+import org.jboss.example.service.Employee;
+
+/**
+ * Check that the salary is relative to the employee's location.
+ */
+public class LocationBasedSalaryStrategy implements SalaryStrategy {
+
+ private int minSalary = 5000;
+ private int maxSalary = 100000;
+
+ private static final int LONDON_MIN_SALARY = 50000;
+ private static final int MANCHESTER_MIN_SALARY = 40000;
+ private static final int GLASGOW_MIN_SALARY = 30000;
+ private static final int BELFAST_MIN_SALARY = 20000;
+
+ public Integer checkSalary(Employee employee, Integer salary) {
+
+ String city = employee.getAddress().getCity();
+
+ // Set minimum salaries depending on the location of the employee
+ if (city.equals("London") && salary < LONDON_MIN_SALARY) {
+ salary = LONDON_MIN_SALARY;
+ } else if (city.equals("Manchester") && salary < MANCHESTER_MIN_SALARY) {
+ salary = MANCHESTER_MIN_SALARY;
+ } else if (city.equals("Glasgow") && salary < GLASGOW_MIN_SALARY) {
+ salary = GLASGOW_MIN_SALARY;
+ } else if (city.equals("Belfast") & salary < BELFAST_MIN_SALARY) {
+ salary = BELFAST_MIN_SALARY;
+ }
+
+ // Apply company-wide ranges
+ if (salary < minSalary) {
+ salary = minSalary;
+ } else if (salary > maxSalary) {
+ salary = maxSalary;
+ }
+
+ return salary;
+ }
+
+ public int getMinSalary() {
+ return minSalary;
+ }
+
+ public void setMinSalary(int minSalary) {
+ this.minSalary = minSalary;
+ }
+
+ public int getMaxSalary() {
+ return maxSalary;
+ }
+
+ public void setMaxSalary(int maxSalary) {
+ this.maxSalary = maxSalary;
+ }
+}
Copied: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/SalaryStrategy.java (from rev 66603, projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/SalaryStrategy.java)
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/SalaryStrategy.java (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/main/java/org/jboss/example/service/util/SalaryStrategy.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -0,0 +1,10 @@
+package org.jboss.example.service.util;
+
+import org.jboss.example.service.Employee;
+
+public interface SalaryStrategy {
+
+ public int getMinSalary();
+ public int getMaxSalary();
+ public Integer checkSalary(Employee employee, Integer salary);
+}
Deleted: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/AgeBasedSalaryTestCase.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/AgeBasedSalaryTestCase.java 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/AgeBasedSalaryTestCase.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -1,35 +0,0 @@
-package org.jboss.example.service;
-
-import org.jboss.example.service.SalaryStrategy;
-
-public class AgeBasedSalaryTestCase extends HRServiceTest
-{
- public AgeBasedSalaryTestCase(String name) {
- super(name);
- }
-
- public void testSalaryRanges() throws Exception {
- SalaryStrategy strategy = (SalaryStrategy) getBean("AgeBasedSalary");
- assertNotNull(strategy);
-
- // Check the minimum and maximum salaries for all employees
- assertEquals(1000, strategy.getMinSalary());
- assertEquals(80000, strategy.getMaxSalary());
-
- // Check the minimum and maximum salaries that bob (age 17) can earn
- assertEquals((Integer) 1000, strategy.checkSalary(bob, 500));
- assertEquals((Integer) 80000, strategy.checkSalary(bob, 85000));
-
- // Check the minimum and maximum salaries that rebecca (age 25) can earn
- assertEquals((Integer) 25000, strategy.checkSalary(rebecca, 20000));
- assertEquals((Integer) 80000, strategy.checkSalary(rebecca, 90000));
-
- // Check the minimum and maximum salaries that karen (age 44) can earn
- assertEquals((Integer) 50000, strategy.checkSalary(karen, 49000));
- assertEquals((Integer) 80000, strategy.checkSalary(karen, 81000));
-
- // Check the minimum and maximum salaries that joe (age 62) can earn
- assertEquals((Integer) 1000, strategy.checkSalary(joe, 900));
- assertEquals((Integer) 80000, strategy.checkSalary(joe, 90000));
- }
-}
\ No newline at end of file
Modified: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/HRServiceTestSuite.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/HRServiceTestSuite.java 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/HRServiceTestSuite.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -1,5 +1,7 @@
package org.jboss.example.service;
+import org.jboss.example.service.util.SalaryStrategyTestSuite;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
@@ -11,12 +13,14 @@
}
public static Test suite() {
- TestSuite suite = new TestSuite("Human Resources Service Tests");
+ TestSuite suite = new TestSuite("Human Resources Manager Tests");
suite.addTestSuite(HRManagerTestCase.class);
- suite.addTestSuite(AgeBasedSalaryTestCase.class);
- suite.addTestSuite(LocationBasedSalaryTestCase.class);
+ suite.addTestSuite(HRManagerAgeBasedTestCase.class);
+ suite.addTestSuite(HRManagerLocationBasedTestCase.class);
+ suite.addTest(SalaryStrategyTestSuite.suite());
+
return suite;
}
}
Deleted: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/LocationBasedSalaryTestCase.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/LocationBasedSalaryTestCase.java 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/LocationBasedSalaryTestCase.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -1,35 +0,0 @@
-package org.jboss.example.service;
-
-import org.jboss.example.service.SalaryStrategy;
-
-public class LocationBasedSalaryTestCase extends HRServiceTest
-{
- public LocationBasedSalaryTestCase(String name) {
- super(name);
- }
-
- public void testSalaryRanges() throws Exception {
- SalaryStrategy strategy = (SalaryStrategy) getBean("LocationBasedSalary");
- assertNotNull(strategy);
-
- // Check the minimum and maximum salaries for all employees
- assertEquals(2000, strategy.getMinSalary());
- assertEquals(90000, strategy.getMaxSalary());
-
- // Check the minimum and maximum salaries that bob (London) can earn
- assertEquals((Integer) 50000, strategy.checkSalary(bob, 30000));
- assertEquals((Integer) 90000, strategy.checkSalary(bob, 95000));
-
- // Check the minimum and maximum salaries that rebecca (Belfast) can earn
- assertEquals((Integer) 20000, strategy.checkSalary(rebecca, 10000));
- assertEquals((Integer) 90000, strategy.checkSalary(rebecca, 91000));
-
- // Check the minimum and maximum salaries that karen (Glagow) can earn
- assertEquals((Integer) 30000, strategy.checkSalary(karen, 29000));
- assertEquals((Integer) 90000, strategy.checkSalary(karen, 98000));
-
- // Check the minimum and maximum salaries that joe (Manchester) can earn
- assertEquals((Integer) 40000, strategy.checkSalary(joe, 31000));
- assertEquals((Integer) 90000, strategy.checkSalary(joe, 96000));
- }
-}
\ No newline at end of file
Copied: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/AgeBasedSalaryTestCase.java (from rev 66603, projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/AgeBasedSalaryTestCase.java)
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/AgeBasedSalaryTestCase.java (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/AgeBasedSalaryTestCase.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -0,0 +1,36 @@
+package org.jboss.example.service.util;
+
+import org.jboss.example.service.HRServiceTest;
+import org.jboss.example.service.util.SalaryStrategy;
+
+public class AgeBasedSalaryTestCase extends HRServiceTest
+{
+ public AgeBasedSalaryTestCase(String name) {
+ super(name);
+ }
+
+ public void testSalaryRanges() throws Exception {
+ SalaryStrategy strategy = (SalaryStrategy) getBean("AgeBasedSalary");
+ assertNotNull(strategy);
+
+ // Check the minimum and maximum salaries for all employees
+ assertEquals(1000, strategy.getMinSalary());
+ assertEquals(80000, strategy.getMaxSalary());
+
+ // Check the minimum and maximum salaries that bob (age 17) can earn
+ assertEquals((Integer) 1000, strategy.checkSalary(bob, 500));
+ assertEquals((Integer) 80000, strategy.checkSalary(bob, 85000));
+
+ // Check the minimum and maximum salaries that rebecca (age 25) can earn
+ assertEquals((Integer) 25000, strategy.checkSalary(rebecca, 20000));
+ assertEquals((Integer) 80000, strategy.checkSalary(rebecca, 90000));
+
+ // Check the minimum and maximum salaries that karen (age 44) can earn
+ assertEquals((Integer) 50000, strategy.checkSalary(karen, 49000));
+ assertEquals((Integer) 80000, strategy.checkSalary(karen, 81000));
+
+ // Check the minimum and maximum salaries that joe (age 62) can earn
+ assertEquals((Integer) 1000, strategy.checkSalary(joe, 900));
+ assertEquals((Integer) 80000, strategy.checkSalary(joe, 90000));
+ }
+}
\ No newline at end of file
Copied: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/LocationBasedSalaryTestCase.java (from rev 66603, projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/LocationBasedSalaryTestCase.java)
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/LocationBasedSalaryTestCase.java (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/LocationBasedSalaryTestCase.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -0,0 +1,36 @@
+package org.jboss.example.service.util;
+
+import org.jboss.example.service.HRServiceTest;
+import org.jboss.example.service.util.SalaryStrategy;
+
+public class LocationBasedSalaryTestCase extends HRServiceTest
+{
+ public LocationBasedSalaryTestCase(String name) {
+ super(name);
+ }
+
+ public void testSalaryRanges() throws Exception {
+ SalaryStrategy strategy = (SalaryStrategy) getBean("LocationBasedSalary");
+ assertNotNull(strategy);
+
+ // Check the minimum and maximum salaries for all employees
+ assertEquals(2000, strategy.getMinSalary());
+ assertEquals(90000, strategy.getMaxSalary());
+
+ // Check the minimum and maximum salaries that bob (London) can earn
+ assertEquals((Integer) 50000, strategy.checkSalary(bob, 30000));
+ assertEquals((Integer) 90000, strategy.checkSalary(bob, 95000));
+
+ // Check the minimum and maximum salaries that rebecca (Belfast) can earn
+ assertEquals((Integer) 20000, strategy.checkSalary(rebecca, 10000));
+ assertEquals((Integer) 90000, strategy.checkSalary(rebecca, 91000));
+
+ // Check the minimum and maximum salaries that karen (Glagow) can earn
+ assertEquals((Integer) 30000, strategy.checkSalary(karen, 29000));
+ assertEquals((Integer) 90000, strategy.checkSalary(karen, 98000));
+
+ // Check the minimum and maximum salaries that joe (Manchester) can earn
+ assertEquals((Integer) 40000, strategy.checkSalary(joe, 31000));
+ assertEquals((Integer) 90000, strategy.checkSalary(joe, 96000));
+ }
+}
\ No newline at end of file
Added: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/SalaryStrategyTestSuite.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/SalaryStrategyTestSuite.java (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/java/org/jboss/example/service/util/SalaryStrategyTestSuite.java 2007-10-31 13:22:58 UTC (rev 66608)
@@ -0,0 +1,24 @@
+package org.jboss.example.service.util;
+
+import org.jboss.example.service.util.AgeBasedSalaryTestCase;
+import org.jboss.example.service.util.LocationBasedSalaryTestCase;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+public class SalaryStrategyTestSuite extends TestSuite
+{
+ public static void main(String[] args) {
+ TestRunner.run(suite());
+ }
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Salary Strategy Unit Tests");
+
+ suite.addTestSuite(AgeBasedSalaryTestCase.class);
+ suite.addTestSuite(LocationBasedSalaryTestCase.class);
+
+ return suite;
+ }
+}
Deleted: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/AgeBasedSalaryTestCase.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/AgeBasedSalaryTestCase.xml 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/AgeBasedSalaryTestCase.xml 2007-10-31 13:22:58 UTC (rev 66608)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
- xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="AgeBasedSalary" class="org.jboss.example.service.AgeBasedSalaryStrategy">
- <property name="minSalary">1000</property>
- <property name="maxSalary">80000</property>
- </bean>
-
-</deployment>
Modified: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/HRManagerAgeBasedTestCase.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/HRManagerAgeBasedTestCase.xml 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/HRManagerAgeBasedTestCase.xml 2007-10-31 13:22:58 UTC (rev 66608)
@@ -9,7 +9,7 @@
<property name="salaryStrategy"><inject bean="AgeBasedSalary"/></property>
</bean>
- <bean name="AgeBasedSalary" class="org.jboss.example.service.AgeBasedSalaryStrategy">
+ <bean name="AgeBasedSalary" class="org.jboss.example.service.util.AgeBasedSalaryStrategy">
<property name="minSalary">1000</property>
<property name="maxSalary">80000</property>
</bean>
Modified: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/HRManagerLocationBasedTestCase.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/HRManagerLocationBasedTestCase.xml 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/HRManagerLocationBasedTestCase.xml 2007-10-31 13:22:58 UTC (rev 66608)
@@ -9,7 +9,7 @@
<property name="salaryStrategy"><inject bean="LocationBasedSalary"/></property>
</bean>
- <bean name="LocationBasedSalary" class="org.jboss.example.service.LocationBasedSalaryStrategy">
+ <bean name="LocationBasedSalary" class="org.jboss.example.service.util.LocationBasedSalaryStrategy">
<property name="minSalary">2000</property>
<property name="maxSalary">70000</property>
</bean>
Deleted: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/LocationBasedSalaryTestCase.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/LocationBasedSalaryTestCase.xml 2007-10-31 13:03:22 UTC (rev 66607)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/LocationBasedSalaryTestCase.xml 2007-10-31 13:22:58 UTC (rev 66608)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
- xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="LocationBasedSalary" class="org.jboss.example.service.LocationBasedSalaryStrategy">
- <property name="minSalary">2000</property>
- <property name="maxSalary">90000</property>
- </bean>
-
-</deployment>
Copied: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/util/AgeBasedSalaryTestCase.xml (from rev 66603, projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/AgeBasedSalaryTestCase.xml)
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/util/AgeBasedSalaryTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/util/AgeBasedSalaryTestCase.xml 2007-10-31 13:22:58 UTC (rev 66608)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AgeBasedSalary" class="org.jboss.example.service.util.AgeBasedSalaryStrategy">
+ <property name="minSalary">1000</property>
+ <property name="maxSalary">80000</property>
+ </bean>
+
+</deployment>
Copied: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/util/LocationBasedSalaryTestCase.xml (from rev 66603, projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/LocationBasedSalaryTestCase.xml)
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/util/LocationBasedSalaryTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/src/test/resources/org/jboss/example/service/util/LocationBasedSalaryTestCase.xml 2007-10-31 13:22:58 UTC (rev 66608)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="LocationBasedSalary" class="org.jboss.example.service.util.LocationBasedSalaryStrategy">
+ <property name="minSalary">2000</property>
+ <property name="maxSalary">90000</property>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list