Add unit tests for ComplexPropertyCollection.complexPropertyChanged

vbauer · vbauer · commit ec904efb6293 · 2015-06-01T15:28:03.000+06:00
diff --git a/src/main/java/microsoft/exchange/webservices/data/property/complex/ComplexProperty.java b/src/main/java/microsoft/exchange/webservices/data/property/complex/ComplexProperty.java
@@ -372,20 +372,18 @@ protected void clearChangeEvents() {
   /**
    * Implements ISelfValidate.validate. Validates this instance.
    *
-   * @throws ServiceValidationException the service validation exception
-   * @throws Exception                  the exception
+   * @throws Exception the exception
    */
-  public void validate() throws ServiceValidationException, Exception {
+  public void validate() throws Exception {
     this.internalValidate();
   }
 
   /**
    * Validates this instance.
    *
-   * @throws ServiceValidationException the service validation exception
-   * @throws Exception
+   * @throws Exception the exception
    */
-  protected void internalValidate() throws ServiceValidationException, Exception {
+  protected void internalValidate() throws Exception {
   }
 
   public Boolean func(EwsServiceXmlReader reader) throws Exception {
diff --git a/src/main/java/microsoft/exchange/webservices/data/property/complex/ComplexPropertyCollection.java b/src/main/java/microsoft/exchange/webservices/data/property/complex/ComplexPropertyCollection.java
@@ -53,24 +53,24 @@ public abstract class ComplexPropertyCollection
   /**
    * The item.
    */
-  private List<TComplexProperty> items = new ArrayList<TComplexProperty>();
+  private final List<TComplexProperty> items = new ArrayList<TComplexProperty>();
 
   /**
    * The added item.
    */
-  private List<TComplexProperty> addedItems =
+  private final List<TComplexProperty> addedItems =
       new ArrayList<TComplexProperty>();
 
   /**
    * The modified item.
    */
-  private List<TComplexProperty> modifiedItems =
+  private final List<TComplexProperty> modifiedItems =
       new ArrayList<TComplexProperty>();
 
   /**
    * The removed item.
    */
-  private List<TComplexProperty> removedItems =
+  private final List<TComplexProperty> removedItems =
       new ArrayList<TComplexProperty>();
 
   /**
diff --git a/src/test/java/microsoft/exchange/webservices/data/property/complex/ComplexPropertyCollectionTest.java b/src/test/java/microsoft/exchange/webservices/data/property/complex/ComplexPropertyCollectionTest.java
@@ -0,0 +1,53 @@
+package microsoft.exchange.webservices.data.property.complex;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.List;
+
+/**
+ * @author Vladislav Bauer
+ */
+
+@RunWith(JUnit4.class)
+public class ComplexPropertyCollectionTest {
+
+  @Test
+  public void testComplexPropertyChangedPositive() {
+    final ComplexPropertyCollection<ComplexProperty> collection = createFakeComplexPropertyCollection();
+
+    final ComplexProperty property = createFakeComplexProperty();
+    collection.complexPropertyChanged(property);
+
+    final List<ComplexProperty> modifiedItems = collection.getModifiedItems();
+    Assert.assertTrue(collection.getAddedItems().isEmpty());
+    Assert.assertTrue(modifiedItems.contains(property));
+    Assert.assertEquals(1, modifiedItems.size());
+  }
+
+  @Test(expected = RuntimeException.class)
+  public void testComplexPropertyChangedNegative() {
+    final ComplexPropertyCollection<ComplexProperty> collection = createFakeComplexPropertyCollection();
+    collection.complexPropertyChanged(null);
+    Assert.fail();
+  }
+
+
+  private ComplexProperty createFakeComplexProperty() {
+    return new ComplexProperty() {};
+  }
+
+  private ComplexPropertyCollection<ComplexProperty> createFakeComplexPropertyCollection() {
+    return new ComplexPropertyCollection<ComplexProperty>() {
+      @Override protected ComplexProperty createComplexProperty(final String xmlElementName) {
+        return null;
+      }
+      @Override protected String getCollectionItemXmlElementName(final ComplexProperty complexProperty) {
+        return null;
+      }
+    };
+  }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -372,20 +372,18 @@ protected void clearChangeEvents() {`
`372`	`372`	`/**`
`373`	`373`	`* Implements ISelfValidate.validate. Validates this instance.`
`374`	`374`	`*`
`375`		`- * @throws ServiceValidationException the service validation exception`
`376`		`- * @throws Exception the exception`
	`375`	`+ * @throws Exception the exception`
`377`	`376`	`*/`
`378`		`- public void validate() throws ServiceValidationException, Exception {`
	`377`	`+ public void validate() throws Exception {`
`379`	`378`	`this.internalValidate();`
`380`	`379`	`}`
`381`	`380`
`382`	`381`	`/**`
`383`	`382`	`* Validates this instance.`
`384`	`383`	`*`
`385`		`- * @throws ServiceValidationException the service validation exception`
`386`		`- * @throws Exception`
	`384`	`+ * @throws Exception the exception`
`387`	`385`	`*/`
`388`		`- protected void internalValidate() throws ServiceValidationException, Exception {`
	`386`	`+ protected void internalValidate() throws Exception {`
`389`	`387`	`}`
`390`	`388`
`391`	`389`	`public Boolean func(EwsServiceXmlReader reader) throws Exception {`