<Imran/Devesh>: Rafactored code

habib · Apr 4, 2011 · 0e82db8 · 0e82db8
1 parent a9cce74
commit 0e82db8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/Src/AnujBank/AnujBank/ClientAccounts.cs b/Src/AnujBank/AnujBank/ClientAccounts.cs
@@ -39,7 +39,7 @@ public bool SharesAccountWith(ClientAccounts clientAccounts)
        }
 
 
-       public double CumulativeBalance()
+       public double NetBalance()
        {
            return accounts.Sum(x => x.Balance);
        }

diff --git a/...jBank/InterestRateConfigurationManager.cs → Src/AnujBank/AnujBank/InterestRates.cs b/...jBank/InterestRateConfigurationManager.cs → Src/AnujBank/AnujBank/InterestRates.cs
@@ -4,18 +4,18 @@
 
 namespace TestAnujBank
 {
-    public class InterestRateConfigurationManager
+    public class InterestRates
     {
 
         private double positiveInterestRate;
         private double negativeInterestRate;
         TextReader Reader { get; set; }
 
-        public InterestRateConfigurationManager()
+        public InterestRates()
         {
 
         }
-        public InterestRateConfigurationManager(TextReader reader)
+        public InterestRates(TextReader reader)
         {
             Reader = reader;
         }

diff --git a/Src/AnujBank/AnujBank/Structure.cs b/Src/AnujBank/AnujBank/Structure.cs
@@ -20,20 +20,17 @@ public bool SharesASourceAccountWith(Structure newStructure)
 
         public double NetBalance()
         {
-            return sourceClientAccounts.CumulativeBalance();
+            return sourceClientAccounts.NetBalance();
         }
 
         public double NetInterest(InterestRateConfigurationManager interestRateConfigurationManager)
         {
-            double cumulativeBalance = sourceClientAccounts.CumulativeBalance();
+            double cumulativeBalance = NetBalance();
             if(cumulativeBalance > 0)
             {
                 return interestRateConfigurationManager.PositiveInterestRate()*cumulativeBalance/36500;
             }
-            else
-            {
-                return interestRateConfigurationManager.NegativeInterestRate()*cumulativeBalance/36500;
-            }
+            return interestRateConfigurationManager.NegativeInterestRate()*cumulativeBalance/36500;
         }
     }
 }
diff --git a/Src/AnujBank/TestAnujBank/TestClientAccounts.cs b/Src/AnujBank/TestAnujBank/TestClientAccounts.cs
@@ -44,7 +44,7 @@ public void ShouldBeAbleToFindTwoClientAccountsShareACommonAccount()
         }
 
         [Test]
-        public void ShouldCalculateCumulativeBalance()
+        public void ShouldCalculateNetBalance()
         {
             var account1 = new Account(new AccountId(12341234), new ClientId("ABC123"));
             var account2 = new Account(new AccountId(12341235), new ClientId("ABC123"));
@@ -55,7 +55,7 @@ public void ShouldCalculateCumulativeBalance()
             clientAccounts.Add(account1);
             clientAccounts.Add(account2);
 
-            Assert.AreEqual(500.0, clientAccounts.CumulativeBalance());
+            Assert.AreEqual(500.0, clientAccounts.NetBalance());
         }
     }
 }
diff --git a/...k/TestInterestRateConfigurationManager.cs → ...nujBank/TestAnujBank/TestInterestRates.cs b/...k/TestInterestRateConfigurationManager.cs → ...nujBank/TestAnujBank/TestInterestRates.cs
@@ -6,13 +6,13 @@
 namespace TestAnujBank
 {
     [TestFixture]
-    public class TestInterestRateConfigurationManager
+    public class TestInterestRates
     {
         [Test]
         public void ShouldLoadInterestRates()
         {
             StringReader reader = new StringReader("PositiveInterestRate=2.0\nNegativeInterestRate=3.0");
-            var configurationManager = new InterestRateConfigurationManager(reader);
+            var configurationManager = new InterestRates(reader);
             Assert.AreEqual(0.0d, configurationManager.PositiveInterestRate());
             Assert.AreEqual(0.0d, configurationManager.NegativeInterestRate());
             configurationManager.Configure();