Details
diff --git a/api/src/main/java/com/ning/billing/junction/api/BlockingState.java b/api/src/main/java/com/ning/billing/junction/api/BlockingState.java
index 5ae1665..dcc066b 100644
--- a/api/src/main/java/com/ning/billing/junction/api/BlockingState.java
+++ b/api/src/main/java/com/ning/billing/junction/api/BlockingState.java
@@ -161,5 +161,20 @@ public class BlockingState implements Comparable<BlockingState>{
return true;
}
+ public String getDescription() {
+ String entitlement = onOff(isBlockEntitlement());
+ String billing = onOff(isBlockBilling());
+ String change = onOff(isBlockChange());
+
+ return String.format("(Change: %s, Entitlement: %s, Billing: %s)", change, entitlement, billing);
+ }
+
+ private String onOff(boolean val) {
+ if(val) {
+ return "Off";
+ } else {
+ return "On";
+ }
+ }
}
diff --git a/overdue/src/test/java/com/ning/billing/overdue/config/io/TestReadConfig.java b/overdue/src/test/java/com/ning/billing/overdue/config/io/TestReadConfig.java
index 76cd152..8208a73 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/config/io/TestReadConfig.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/config/io/TestReadConfig.java
@@ -23,7 +23,7 @@ import com.ning.billing.overdue.config.OverdueConfig;
import com.ning.billing.util.config.XMLLoader;
public class TestReadConfig {
- @Test(enabled=false) //TODO MDW whilst refactoring
+ @Test(enabled=true)
public void testConfigLoad() throws Exception {
XMLLoader.getObjectFromString(Resources.getResource("OverdueConfig.xml").toExternalForm(), OverdueConfig.class);
}
diff --git a/overdue/src/test/resources/OverdueConfig.xml b/overdue/src/test/resources/OverdueConfig.xml
index 6318e8d..e58ccc1 100644
--- a/overdue/src/test/resources/OverdueConfig.xml
+++ b/overdue/src/test/resources/OverdueConfig.xml
@@ -8,13 +8,13 @@
OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for
the specific language governing permissions and limitations ~ under the License. -->
-<overdueRules xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<overdueConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="CatalogSchema.xsd ">
<bundleOverdueStates>
<state name="Clear">
<isClearState>true</isClearState>
</state>
</bundleOverdueStates>
-</overdueRules>
+</overdueConfig>
\ No newline at end of file
diff --git a/overdue/src/test/resources/OverdueConfigSchema.xsd b/overdue/src/test/resources/OverdueConfigSchema.xsd
index 36379ef..256da08 100644
--- a/overdue/src/test/resources/OverdueConfigSchema.xsd
+++ b/overdue/src/test/resources/OverdueConfigSchema.xsd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0">
-<xs:element name="overdue" type="overdueRules"/>
-<xs:complexType name="overdueRules">
+<xs:element name="overdueConfig" type="overdueConfig"/>
+<xs:complexType name="overdueConfig">
<xs:complexContent>
<xs:extension base="validatingConfig">
<xs:sequence>