diff --git a/.gitignore b/.gitignore
index 8eb5ff0b2..e2a23af44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
*.class
-# Package Files #
+# Package Files
*.jar
*.war
*.ear
@@ -11,6 +11,21 @@
.classpath
.project
-# IDEA project files
+# IntelliJ
+# User-specific stuff:
+.idea
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/findbugs-idea.xml
+.idea/codeStyleSettings.xml
+.idea/dictionaries
+.idea/shelf
+*.iws
+*.ipr
*.iml
-.idea
\ No newline at end of file
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..063139190
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,55 @@
+# The MIT License
+# Copyright (c) 2012 Microsoft Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+language: java
+
+jdk:
+ - oraclejdk8
+ - oraclejdk7
+ - openjdk6
+
+# enable container-based infrastructure
+sudo: false
+
+env:
+ global:
+ - secure: "V37/WY3//w4fQUxmtKXw9dsU4iH5Z6HvTpBkZj+5DaX5h2Lj98FzALvkGSt7KvqVKQBbgETjs3HTMQkz6hwbLgX2okLKCQbmhZu3vQLqkWe6KPqnO1NOKSaU4vhCoGpScNWMiVxrzCHLHZf5tQu7d+1WVMk5GNlgGqeKVSnz5LY="
+ - secure: "O9Mjx/mU5MLQsngcVbTf7AVMFo2Bh3ZWXwTyiLVXAfU7/VZX39vx30Mf2laNpewYqbiouix7fOkK76YS8459QRoLVBAQSwzjuGsZAwQvz7b7+r3kCS7rwGm7eCobJDbwItoxAxA00rI3gpyX/BnaX8aFutQw/0ZoPSPOH+LzR+4="
+
+# cache local repository for speed of build
+cache:
+ directories:
+ - $HOME/.m2/repository
+before_cache:
+ - rm -rf $HOME/.m2/repository/com/microsoft/ews-java-api
+
+notifications:
+ webhooks:
+ urls:
+ - https://webhooks.gitter.im/e/04643d955d03eb39e24e
+ on_success: change
+
+before_install:
+ - chmod +x ./deploy_snapshot.sh
+
+after_success:
+ - bash <(curl -s https://codecov.io/bash)
+ - ./deploy_snapshot.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c3b12aacf..9be0ef785 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,42 +1,4 @@
-## Contributing to Exchange Web Services Java API
+## Contributing.md
-There are several ways to contribute to the project:
-
-* Report bugs and features in the [issue tracker](https://github.com/officedev/ews-java-api/issues).
-* Submit and review pull requests
-* Help with documentation
-* Help with testing
-
-GitHub supports [markdown](http://github.github.com/github-flavored-markdown/), so when filing bugs make sure you check the formatting before clicking submit.
-
-### Contributing code and content
-Before submitting a feature or substantial code contribution please discuss it with the team and ensure it follows the product roadmap. You might also read these two blogs posts on contributing code:
-
-* [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza
-* [Don't "Push" Your Pull Requests](http://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik.
-
-### Pull Requests
-If you don't know what a pull request is read the "[Using pull requests](https://help.github.com/articles/using-pull-requests)" article.
-
-Some guidelines for pull requests:
-
-* Use a descriptive title and description.
-* Include a single logical change.
-* Base on master branch - once accepted, can be ported to stable branches.
-* Should cleanly merge with target branch.
-
-### Commit Messages
-1. Separate subject from body with a blank line
-2. Limit the subject line to 50 characters
-3. Capitalize the subject line
-4. Do not end the subject line with a period
-5. Use the imperative mood in the subject line (e.g. Fix #123: Make pigs fly).
-6. Wrap the body at 72 characters
-7. Use the body to explain what and why. The how should be mostly covered by the diff.
-
-References:
-
-* [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/)
-* [A Note About Git Commit Messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-* [Guidelines for Commit Messages](https://wiki.gnome.org/Git/CommitMessages)
-* [On commit messages](http://who-t.blogspot.de/2009/12/on-commit-messages.html)
+### To participate, please visit the project wiki for more information.
+*Guidelines can be found* [**HERE**](https://github.com/OfficeDev/ews-java-api/wiki/Contributing)
\ No newline at end of file
diff --git a/deploy_snapshot.sh b/deploy_snapshot.sh
new file mode 100644
index 000000000..09f13b0c5
--- /dev/null
+++ b/deploy_snapshot.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# The MIT License
+# Copyright (c) 2012 Microsoft Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+if [ "$TRAVIS_REPO_SLUG" != "OfficeDev/ews-java-api" ]; then
+ echo "[DEPLOY] Skipping snapshot deployment for repo:'$TRAVIS_REPO_SLUG'."
+elif [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+ echo "[DEPLOY] Skipping snapshot deployment for a pull request."
+elif [ "$TRAVIS_SECURE_ENV_VARS" == "false" ]; then
+ echo "[DEPLOY] Skipping snapshot deployment due to TRAVIS_SECURE_ENV_VARS is set to '$TRAVIS_SECURE_ENV_VARS'."
+elif [ "$TRAVIS_JDK_VERSION" != "oraclejdk7" ]; then
+ echo "[DEPLOY] Skipping snapshot deployment for jdk:'$TRAVIS_JDK_VERSION'."
+else
+ echo "[DEPLOY] Deploying snapshot for commit:'$TRAVIS_COMMIT' @ build-id:'$TRAVIS_BUILD_ID'"
+ # create settings.xml
+ echo "ossrh-snapshot${OSSRHUSER}${OSSRHPASS}" > $HOME/.m2/settings.xml
+ # deploy
+ if [ -z "${GPG_PASSPHRASE+xxx}" ]; then
+ echo "[INFO] Deploying unsigned artifacts"
+ mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true -Dcheckstyle.skip=true
+ else
+ echo "[INFO] Deploying signed artifacts"
+ mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true -Dcheckstyle.skip=true -Dgpg.passphrase=$GPG_PASSPHRASE
+ fi
+ # clean up
+ rm -f $HOME/.m2/settings.xml
+fi
diff --git a/license.txt b/license.txt
index d60bc954c..364ee36bf 100644
--- a/license.txt
+++ b/license.txt
@@ -1,22 +1,20 @@
-Exchange Web Services Java API
+The MIT License
+Copyright (c) 2012 Microsoft Corporation
-Copyright (c) Microsoft Corporation
-All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-MIT License
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-Permission is hereby granted, free of charge, to any person obtaining a copy of this
-software and associated documentation files (the ""Software""), to deal in the Software
-without restriction, including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/pom.xml b/pom.xml
index ee1d17dbc..e303359bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,37 @@
+
4.0.0
- com.microsoft.office
+ com.microsoft.ews-java-apiews-java-api
- 1.3-SNAPSHOT
+
+ 2.1-SNAPSHOTExchange Web Services Java APIExchange Web Services (EWS) Java API
@@ -28,46 +53,344 @@
http://www.microsoft.com/
+
+
+ vboctor
+ Victor Boctor
+ vboctor@users.noreply.github.com
+ http://www.github.com/officedev/ews-java-api
+ Microsoft
+ http://www.microsoft.com
+
+ administrator
+ developer
+
+ America/New_York
+
+ http://www.example.com/jdoe/pic
+
+
+
+
UTF-8
- 1.7
+ 1.6
+
+
+
+ 2.16
+ 1.6
+ 2.10.3
+ 3.3
+ 1.6.5
+ 2.4
+ 1.14
+ 1.1
+
+ 3.4
+ 2.8
+ 2.2
+ 2.5
+ 2.18.1
+ 0.7.5.201505241946
+
+ 4.4.1
+ 4.4.1
+ 1.2
+ 2.8
+ 3.4
+ 2.4
+
+ 4.12
+ 1.3
+ 1.10.19
+ 1.7.12
+ 1.1.3
+
+
+
+ default-jdk18-profile
+
+ [1.8,)
+
+
+ -Xdoclint:none
+
+
+
+
+ java-7-or-later-profile
+
+ [1.7,)
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ ${maven-checkstyle-plugin.version}
+
+ true
+ google_checks.xml
+
+
+
+ verify
+
+ checkstyle
+
+
+
+
+
+
+
+
+ release-sign-artifacts
+
+
+ gpg.passphrase
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ ${maven-gpg-plugin.version}
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+
+
+
+
+
+
+ MIT License
+ http://opensource.org/licenses/MIT
+ repo
+
+
+
+
+ https://github.com/OfficeDev/ews-java-api/issues
+ GitHub Issues
+
+
+
+ travis
+ https://travis-ci.org/OfficeDev/ews-java-api
+
+
+
+ https://github.com/OfficeDev/ews-java-api
+ scm:git:ssh://git@github.com:OfficeDev/ews-java-api.git
+ scm:git:ssh://git@github.com:OfficeDev/ews-java-api.git
+
+
+
+
+ ossrh-snapshot
+ https://oss.sonatype.org/content/repositories/snapshots
+
+
+ ossrh
+ https://oss.sonatype.org/service/local/staging/deploy/maven2
+
+
+
- commons-httpclient
- commons-httpclient
- 3.1
+ org.apache.httpcomponents
+ httpclient
+ ${httpclient.version}
+
+
+
+ org.apache.httpcomponents
+ httpcore
+ ${httpcore.version}
+
+
+
+ commons-io
+ commons-io
+ ${commons-io.version}commons-loggingcommons-logging
- 1.2
+ ${commons-logging.version}
- jcifs
- jcifs
- 1.3.17
-
-
- javax.servlet
- servlet-api
-
-
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3.version}
+
+
+
+ joda-time
+ joda-time
+ ${joda-time.version}junitjunit
- 4.11
+ ${junit.version}
+ test
+
+
+
+ org.hamcrest
+ hamcrest-all
+ ${hamcrest-all.version}
+ test
+
+
+
+ org.mockito
+ mockito-core
+ ${mockito-core.version}
+ test
+
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+ test
+
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+ test
+
+
+
+ org.slf4j
+ jcl-over-slf4j
+ ${slf4j.version}
+ test
+
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ ${nexus-staging-maven-plugin.version}
+ true
+
+
+ true
+ ossrh
+ https://oss.sonatype.org/
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+ ${project.build.sourceEncoding}
+ ${javaLanguage.version}
+ ${javaLanguage.version}
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ ${maven-javadoc-plugin.version}
+
+ true
+ ${javadoc.doclint.param}
+
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ ${maven-source-plugin.version}
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ org.codehaus.mojo
+ animal-sniffer-maven-plugin
+ ${animal-sniffer-maven-plugin.version}
+
+
+ org.codehaus.mojo.signature
+ java16-sun
+ ${animal-sniffer-maven-plugin.signature.version}
+
+
+
+
+ check-java16-sun
+ test
+
+ check
+
+
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco-maven-plugin.version}
+
+
+
+ prepare-agent
+
+
+
+ report
+ test
+
+ report
+
+
+
+
+
+
@@ -76,7 +399,7 @@
org.apache.maven.pluginsmaven-site-plugin
- 3.3
+ ${maven-site-plugin.version}
@@ -88,7 +411,7 @@
org.apache.maven.pluginsmaven-project-info-reports-plugin
- 2.7
+ ${maven-project-info-reports-plugin.version}Maven
@@ -11,10 +35,8 @@
-
-
\ No newline at end of file
+
diff --git a/src/test/java/microsoft/exchange/webservices/base/BaseTest.java b/src/test/java/microsoft/exchange/webservices/base/BaseTest.java
new file mode 100644
index 000000000..46b07d915
--- /dev/null
+++ b/src/test/java/microsoft/exchange/webservices/base/BaseTest.java
@@ -0,0 +1,66 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package microsoft.exchange.webservices.base;
+
+import microsoft.exchange.webservices.data.core.ExchangeService;
+import microsoft.exchange.webservices.data.core.ExchangeServiceBase;
+import microsoft.exchange.webservices.data.core.request.HttpWebRequest;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * A base class with "Common-Services"
+ */
+@RunWith(JUnit4.class)
+public abstract class BaseTest {
+
+ /**
+ * Mock for the ExchangeServiceBase
+ */
+ protected static ExchangeServiceBase exchangeServiceBaseMock;
+
+ /**
+ * Mock for the ExchangeService
+ */
+ protected static ExchangeService exchangeServiceMock;
+
+ /**
+ * Setup Mocks
+ *
+ * @throws Exception
+ */
+ @BeforeClass
+ public static final void setUpBaseClass() throws Exception {
+ // Mock up ExchangeServiceBase
+ exchangeServiceBaseMock = new ExchangeServiceBase() {
+ @Override
+ protected void processHttpErrorResponse(HttpWebRequest httpWebResponse, Exception webException)
+ throws Exception {
+ throw webException;
+ }
+ };
+ exchangeServiceMock = new ExchangeService();
+ }
+}
diff --git a/src/test/java/microsoft/exchange/webservices/base/util/TestUtils.java b/src/test/java/microsoft/exchange/webservices/base/util/TestUtils.java
new file mode 100644
index 000000000..3358ca533
--- /dev/null
+++ b/src/test/java/microsoft/exchange/webservices/base/util/TestUtils.java
@@ -0,0 +1,69 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package microsoft.exchange.webservices.base.util;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+
+@Ignore
+public final class TestUtils {
+
+ private TestUtils() {
+ throw new UnsupportedOperationException();
+ }
+
+
+ /**
+ * Check that class has only one private constructor without parameters that throws exception during
+ * instantiation. It's necessary for util-classes.
+ *
+ * @param utilClass util-class
+ * @throws Throwable exception during instantiation
+ */
+ public static void checkUtilClassConstructor(final Class utilClass) throws Throwable {
+ // Check count of available constructors.
+ final Constructor[] constructors = utilClass.getDeclaredConstructors();
+ Assert.assertEquals(1, constructors.length);
+
+ // Check accessibility.
+ final Constructor constructor = constructors[0];
+ Assert.assertTrue(Modifier.isPrivate(constructor.getModifiers()));
+
+ // Try to create instance.
+ constructor.setAccessible(true);
+ try {
+ constructor.newInstance();
+ } catch (final InvocationTargetException ex) {
+ throw ex.getTargetException();
+ }
+
+ // We should never get this situation.
+ Assert.fail();
+ }
+
+}
diff --git a/src/test/java/microsoft/exchange/webservices/data/EwsUtilitiesTest.java b/src/test/java/microsoft/exchange/webservices/data/EwsUtilitiesTest.java
deleted file mode 100644
index 5ce0f4aab..000000000
--- a/src/test/java/microsoft/exchange/webservices/data/EwsUtilitiesTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**************************************************************************
- * copyright file="EwsUtilitiesTest.java" company="Microsoft"
- * Copyright (c) Microsoft Corporation. All rights reserved.
- *
- * Defines the EwsUtilitiesTest.java.
- **************************************************************************/
-
-package microsoft.exchange.webservices.data;
-
-import org.junit.Assert;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.junit.Test;
-
-@RunWith(JUnit4.class)
-public class EwsUtilitiesTest {
- @Test
- public void testGetBuildVersion() {
- Assert.assertEquals("Build version must be 0s", "0.0.0.0", EwsUtilities.getBuildVersion());
- }
-}
diff --git a/src/test/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollectionTest.java b/src/test/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollectionTest.java
new file mode 100644
index 000000000..084bbfec8
--- /dev/null
+++ b/src/test/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollectionTest.java
@@ -0,0 +1,87 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package microsoft.exchange.webservices.data.autodiscover;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.ByteArrayInputStream;
+
+import org.junit.Test;
+
+import microsoft.exchange.webservices.data.core.EwsXmlReader;
+
+public class AlternateMailboxCollectionTest {
+
+ private static final String PARTIAL_RESULT =
+ ""
+ + "http://schemas.microsoft.com/exchange/2010/Autodiscover/Autodiscover/GetUserSettingsResponse"
+ + ""
+ + "1501076"
+ + "0Exchange2013_SP1"
+ + ""
+ + ""
+ + ""
+ + ""
+ + "AlternateMailboxes"
+ + "Archive"
+ + "Personal Archive - Testaccount008"
+ + "ou=Exchange Administrative Group/cn=Testaccount008 Test"
+ + "cb7c4056-a738-4004-bd0d-65b58d3b7bc1@test.com"
+ + "testaccount008@test.com"
+ + "Delegate"
+ + "Testaccount007 Test"
+ + "testaccount007@test.com"
+ + "testaccount007@test.com"
+ + ""
+ + "";
+
+
+ @Test
+ public void testGetEntries() throws Exception {
+ final AlternateMailboxCollection amc =
+ AlternateMailboxCollection.loadFromXml(new EwsXmlReader(
+ new ByteArrayInputStream(PARTIAL_RESULT.getBytes())));
+
+ assertEquals(2, amc.getEntries().size());
+
+ final AlternateMailbox first = amc.getEntries().get(0);
+ assertEquals("Archive", first.getType());
+ assertEquals("Personal Archive - Testaccount008", first.getDisplayName());
+ assertEquals("ou=Exchange Administrative Group/cn=Testaccount008 Test",
+ first.getLegacyDN());
+ assertEquals("cb7c4056-a738-4004-bd0d-65b58d3b7bc1@test.com",
+ first.getServer());
+ assertNull(first.getSmtpAddress());
+ assertEquals("testaccount008@test.com", first.getOwnerSmtpAddress());
+
+ final AlternateMailbox second = amc.getEntries().get(1);
+ assertEquals("Delegate", second.getType());
+ assertEquals("Testaccount007 Test", second.getDisplayName());
+ assertNull(second.getLegacyDN());
+ assertNull(second.getServer());
+ assertEquals("testaccount007@test.com", second.getSmtpAddress());
+ assertEquals("testaccount007@test.com", second.getOwnerSmtpAddress());
+ }
+}
diff --git a/src/test/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverDnsClientTest.java b/src/test/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverDnsClientTest.java
new file mode 100644
index 000000000..0e529b036
--- /dev/null
+++ b/src/test/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverDnsClientTest.java
@@ -0,0 +1,65 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package microsoft.exchange.webservices.data.autodiscover;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class AutodiscoverDnsClientTest {
+
+ final String validResponse = "autodiscover.contoso.com";
+ final String trailingDotResponse = "autodiscover.contoso.com.";
+
+ /**
+ * If DNS gives us a null, we should return a null
+ */
+ @Test public void textExtractNullHostnameFromDnsSrv() {
+ assertEquals(AutodiscoverDnsClient.extractHostnameFromDnsSrv(null), null);
+ }
+
+ /**
+ * If DNS gives us back an empty string, we should return a null
+ */
+ @Test public void textExtractEmptyHostnameFromDnsSrv() {
+ assertEquals(AutodiscoverDnsClient.extractHostnameFromDnsSrv(""), null);
+ }
+
+ /**
+ * If DNS gives us back a plain domain, we should pass it through.
+ */
+ @Test public void textExtractValidHostnameFromDnsSrv() {
+ assertEquals(AutodiscoverDnsClient.extractHostnameFromDnsSrv(validResponse), validResponse);
+ }
+
+ /**
+ * If DNS gives us back a domain with a trailing dot, we should strip it.
+ */
+ @Test public void textExtractTrailingDotHostnameFromDnsSrv() {
+ assertEquals(AutodiscoverDnsClient.extractHostnameFromDnsSrv(trailingDotResponse), validResponse);
+ }
+}
diff --git a/src/test/java/microsoft/exchange/webservices/data/autodiscover/request/GetUserSettingsRequestTest.java b/src/test/java/microsoft/exchange/webservices/data/autodiscover/request/GetUserSettingsRequestTest.java
new file mode 100644
index 000000000..717d88f79
--- /dev/null
+++ b/src/test/java/microsoft/exchange/webservices/data/autodiscover/request/GetUserSettingsRequestTest.java
@@ -0,0 +1,193 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package microsoft.exchange.webservices.data.autodiscover.request;
+
+
+import microsoft.exchange.webservices.base.BaseTest;
+import microsoft.exchange.webservices.data.autodiscover.AutodiscoverService;
+import microsoft.exchange.webservices.data.core.EwsServiceXmlWriter;
+import microsoft.exchange.webservices.data.core.enumeration.misc.ExchangeVersion;
+import microsoft.exchange.webservices.data.core.exception.misc.ArgumentException;
+import microsoft.exchange.webservices.data.core.exception.service.local.ServiceValidationException;
+import microsoft.exchange.webservices.data.core.exception.service.local.ServiceXmlSerializationException;
+import org.hamcrest.core.IsNot;
+import org.hamcrest.core.IsNull;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import javax.xml.stream.XMLStreamException;
+
+import java.io.ByteArrayOutputStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Testclass for methods of GetUserSettingsRequest
+ */
+@RunWith(Parameterized.class)
+public class GetUserSettingsRequestTest extends BaseTest {
+
+ /**
+ * The ExchangeVersion which is under test
+ */
+ private final ExchangeVersion exchangeVersion;
+
+ /**
+ * The AutodiscoverService which is under test
+ */
+ private final AutodiscoverService autodiscoverService;
+
+ /**
+ * A mocked URI via HTTPS
+ */
+ private final URI uriMockHttps = URI.create("https://localhost");
+
+ /**
+ * A mocked URI via HTTP
+ */
+ private final URI uriMockHttp = URI.create("http://localhost");
+
+ /**
+ * Returns the Parameters which where handled to the constructor
+ *
+ * @return the available Services
+ * @throws ArgumentException
+ */
+ @Parameterized.Parameters
+ public static List getAutodiscoverServices() throws ArgumentException {
+ return new ArrayList() {
+
+ /**
+ * Constant serialized ID used for compatibility.
+ */
+ private static final long serialVersionUID = 1L;
+
+ {
+ for (ExchangeVersion exchangeVersion : ExchangeVersion.values()) {
+ add(new Object[] {exchangeVersion, new AutodiscoverService(exchangeVersion)});
+ }
+ }
+ };
+ }
+
+ /**
+ * Construct the Testobject with given Parameters
+ *
+ * @param exchangeVersion
+ * @param autodiscoverService
+ */
+ public GetUserSettingsRequestTest(final ExchangeVersion exchangeVersion,
+ final AutodiscoverService autodiscoverService) {
+ this.exchangeVersion = exchangeVersion;
+ this.autodiscoverService = autodiscoverService;
+ }
+
+ /**
+ * setup
+ */
+ @Before
+ public void setup() {
+ Assert.assertThat(this.exchangeVersion, IsNull.notNullValue());
+ Assert.assertThat(this.autodiscoverService, IsNull.notNullValue());
+ Assert.assertThat(uriMockHttp, IsNull.notNullValue());
+ Assert.assertThat(uriMockHttps, IsNull.notNullValue());
+ }
+
+ /**
+ * Nothing should be written to the OutputStream if expectPartnerToken is not set.
+ *
+ * @throws ServiceValidationException
+ * @throws XMLStreamException the XML stream exception
+ * @throws ServiceXmlSerializationException the service xml serialization exception
+ */
+ @Test
+ public void testWriteExtraCustomSoapHeadersToXmlWithoutPartnertoken()
+ throws ServiceValidationException, XMLStreamException, ServiceXmlSerializationException {
+ // HTTPS
+ GetUserSettingsRequest getUserSettingsRequest =
+ new GetUserSettingsRequest(autodiscoverService, uriMockHttps);
+
+ // Test without expected Partnertoken
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ getUserSettingsRequest.writeExtraCustomSoapHeadersToXml(
+ new EwsServiceXmlWriter(exchangeServiceBaseMock, byteArrayOutputStream));
+
+ // nothing should be writyen to the outputstream
+ Assert.assertArrayEquals(byteArrayOutputStream.toByteArray(), new ByteArrayOutputStream().toByteArray());
+
+ // HTTP
+ getUserSettingsRequest = new GetUserSettingsRequest(autodiscoverService, uriMockHttp);
+
+ // Test without expected Partnertoken
+ byteArrayOutputStream = new ByteArrayOutputStream();
+ getUserSettingsRequest.writeExtraCustomSoapHeadersToXml(
+ new EwsServiceXmlWriter(exchangeServiceBaseMock, byteArrayOutputStream));
+
+ // nothing should be written to the outputstream
+ Assert.assertArrayEquals(byteArrayOutputStream.toByteArray(), new ByteArrayOutputStream().toByteArray());
+ }
+
+ /**
+ * Test if content is added correctly if expectPartnerToken is set.
+ *
+ * @throws ServiceValidationException
+ * @throws XMLStreamException the XML stream exception
+ * @throws ServiceXmlSerializationException the service xml serialization exception
+ */
+ @Test
+ public void testWriteExtraCustomSoapHeadersToXmlWithPartnertoken()
+ throws ServiceValidationException, XMLStreamException, ServiceXmlSerializationException {
+ GetUserSettingsRequest getUserSettingsRequest =
+ new GetUserSettingsRequest(autodiscoverService, uriMockHttps, Boolean.TRUE);
+
+ // Test without expected Partnertoken
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ getUserSettingsRequest.writeExtraCustomSoapHeadersToXml(
+ new EwsServiceXmlWriter(exchangeServiceBaseMock, byteArrayOutputStream));
+
+ // data should be added the same way as mentioned
+ Assert.assertThat(byteArrayOutputStream.toByteArray(),
+ IsNot.not(new ByteArrayOutputStream().toByteArray()));
+
+ //TODO Test if the output is really correct
+ }
+
+ /**
+ * Initialising a GetUserSettingsRequest with Http should lead to an ServiceValidationException.
+ *
+ * @throws ServiceValidationException
+ * @throws XMLStreamException the XML stream exception
+ * @throws ServiceXmlSerializationException the service xml serialization exception
+ */
+ @Test(expected = ServiceValidationException.class)
+ public void testWriteExtraCustomSoapHeadersToXmlWithPartnertoken2()
+ throws ServiceValidationException, XMLStreamException, ServiceXmlSerializationException {
+ GetUserSettingsRequest getUserSettingsRequest =
+ new GetUserSettingsRequest(autodiscoverService, uriMockHttp, Boolean.TRUE);
+ }
+}
diff --git a/src/test/java/microsoft/exchange/webservices/data/core/EwsUtilitiesTest.java b/src/test/java/microsoft/exchange/webservices/data/core/EwsUtilitiesTest.java
new file mode 100644
index 000000000..b93023cea
--- /dev/null
+++ b/src/test/java/microsoft/exchange/webservices/data/core/EwsUtilitiesTest.java
@@ -0,0 +1,205 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package microsoft.exchange.webservices.data.core;
+
+import static org.junit.Assert.assertEquals;
+
+import microsoft.exchange.webservices.data.core.service.folder.CalendarFolder;
+import microsoft.exchange.webservices.data.core.service.folder.ContactsFolder;
+import microsoft.exchange.webservices.data.core.service.folder.Folder;
+import microsoft.exchange.webservices.data.core.service.folder.SearchFolder;
+import microsoft.exchange.webservices.data.core.service.folder.TasksFolder;
+import microsoft.exchange.webservices.data.core.service.item.Appointment;
+import microsoft.exchange.webservices.data.core.service.item.Contact;
+import microsoft.exchange.webservices.data.core.service.item.ContactGroup;
+import microsoft.exchange.webservices.data.core.service.item.Conversation;
+import microsoft.exchange.webservices.data.core.service.item.EmailMessage;
+import microsoft.exchange.webservices.data.core.service.item.Item;
+import microsoft.exchange.webservices.data.core.service.item.MeetingCancellation;
+import microsoft.exchange.webservices.data.core.service.item.MeetingMessage;
+import microsoft.exchange.webservices.data.core.service.item.MeetingRequest;
+import microsoft.exchange.webservices.data.core.service.item.MeetingResponse;
+import microsoft.exchange.webservices.data.core.service.item.PostItem;
+import microsoft.exchange.webservices.data.core.service.item.Task;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@RunWith(JUnit4.class)
+public class EwsUtilitiesTest {
+
+ @Test
+ public void testGetBuildVersion() {
+ assertEquals("Build version must be 0s", "0.0.0.0", EwsUtilities.getBuildVersion());
+ }
+
+ @Test
+ public void testGetItemTypeFromXmlElementName() {
+ assertEquals(Task.class, EwsUtilities.getItemTypeFromXmlElementName("Task"));
+ assertEquals(EmailMessage.class, EwsUtilities.getItemTypeFromXmlElementName("Message"));
+ assertEquals(PostItem.class, EwsUtilities.getItemTypeFromXmlElementName("PostItem"));
+ assertEquals(SearchFolder.class, EwsUtilities.getItemTypeFromXmlElementName("SearchFolder"));
+ assertEquals(Conversation.class, EwsUtilities.getItemTypeFromXmlElementName("Conversation"));
+ assertEquals(Folder.class, EwsUtilities.getItemTypeFromXmlElementName("Folder"));
+ assertEquals(CalendarFolder.class, EwsUtilities.getItemTypeFromXmlElementName("CalendarFolder"));
+ assertEquals(MeetingMessage.class, EwsUtilities.getItemTypeFromXmlElementName("MeetingMessage"));
+ assertEquals(Contact.class, EwsUtilities.getItemTypeFromXmlElementName("Contact"));
+ assertEquals(Item.class, EwsUtilities.getItemTypeFromXmlElementName("Item"));
+ assertEquals(Appointment.class, EwsUtilities.getItemTypeFromXmlElementName("CalendarItem"));
+ assertEquals(ContactsFolder.class, EwsUtilities.getItemTypeFromXmlElementName("ContactsFolder"));
+ assertEquals(MeetingRequest.class, EwsUtilities.getItemTypeFromXmlElementName("MeetingRequest"));
+ assertEquals(TasksFolder.class, EwsUtilities.getItemTypeFromXmlElementName("TasksFolder"));
+ assertEquals(MeetingCancellation.class, EwsUtilities.getItemTypeFromXmlElementName("MeetingCancellation"));
+ assertEquals(MeetingResponse.class, EwsUtilities.getItemTypeFromXmlElementName("MeetingResponse"));
+ assertEquals(ContactGroup.class, EwsUtilities.getItemTypeFromXmlElementName("DistributionList"));
+ }
+
+ @Test
+ public void testEwsAssert() {
+ EwsUtilities.ewsAssert(true, null, null);
+
+ try {
+ EwsUtilities.ewsAssert(false, "a", "b");
+ } catch (final RuntimeException ex) {
+ assertEquals("[a] b", ex.getMessage());
+ }
+ }
+
+ @Test
+ public void testParseBigInt() throws ParseException {
+ assertEquals(BigInteger.TEN, EwsUtilities.parse(BigInteger.class, BigInteger.TEN.toString()));
+ }
+
+ @Test
+ public void testParseBigDec() throws ParseException {
+ assertEquals(BigDecimal.TEN, EwsUtilities.parse(BigDecimal.class, BigDecimal.TEN.toString()));
+ }
+
+ @Test
+ public void testParseString() throws ParseException {
+ final String input = "lorem ipsum dolor sit amet";
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input));
+ }
+
+ @Test
+ public void testParseDouble() throws ParseException {
+ Double input = Double.MAX_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = 0.0;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = Double.MIN_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+ }
+
+ @Test
+ public void testParseInteger() throws ParseException {
+ Integer input = Integer.MAX_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = 0;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = Integer.MIN_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+ }
+
+ @Test
+ public void testParseBoolean() throws ParseException {
+ Boolean input = Boolean.TRUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = Boolean.FALSE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+ }
+
+ @Test
+ public void testParseLong() throws ParseException {
+ Long input = Long.MAX_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = 0l;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = Long.MIN_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+ }
+
+ @Test
+ public void testParseFloat() throws ParseException {
+ Float input = Float.MAX_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = 0f;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = Float.MIN_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+ }
+
+ @Test
+ public void testParseShort() throws ParseException {
+ Short input = Short.MAX_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = 0;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = Short.MIN_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+ }
+
+ @Test
+ public void testParseByte() throws ParseException {
+ Byte input = Byte.MAX_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = 0;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+
+ input = Byte.MIN_VALUE;
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input.toString()));
+ }
+
+ @Test
+ public void testParseDate() throws ParseException {
+ final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ String input = sdf.format(new Date());
+ assertEquals(input, EwsUtilities.parse(input.getClass(), input));
+ }
+
+ @Test
+ public void testParseNullValue() throws ParseException {
+ final String input = null;
+ assertEquals(input, EwsUtilities.parse(String.class, input));
+ }
+
+}
diff --git a/src/test/java/microsoft/exchange/webservices/data/core/EwsXmlReaderTest.java b/src/test/java/microsoft/exchange/webservices/data/core/EwsXmlReaderTest.java
new file mode 100644
index 000000000..b84ed4b0a
--- /dev/null
+++ b/src/test/java/microsoft/exchange/webservices/data/core/EwsXmlReaderTest.java
@@ -0,0 +1,102 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package microsoft.exchange.webservices.data.core;
+
+import static org.mockito.Mockito.doReturn;
+
+import microsoft.exchange.webservices.data.security.XmlNodeType;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.events.Characters;
+import javax.xml.stream.events.XMLEvent;
+
+import java.io.ByteArrayInputStream;
+
+public class EwsXmlReaderTest {
+
+ @Mock(name="presentEvent") XMLEvent presentEvent;
+ @Mock(name="xmlReader") XMLEventReader xmlReader;
+ @InjectMocks EwsXmlReader impl;
+ @Mock Characters character;
+
+ @Before
+ public void setUp() throws Exception {
+ impl = new EwsXmlReader(new ByteArrayInputStream((""
+ + "").getBytes("UTF-8")));
+ MockitoAnnotations.initMocks(this);
+
+ }
+
+ @Test
+ public void testReadValueWhenCharacterDataIsNull() throws Exception {
+
+ doReturn(false).when(presentEvent).isStartElement();
+ doReturn(XmlNodeType.CHARACTERS).when(presentEvent).getEventType();
+ doReturn(true).when(presentEvent).isCharacters();
+ doReturn(character).when(presentEvent).asCharacters();
+
+ //next event, then end event, then no more event
+ doReturn(true).doReturn(true).doReturn(false).when(xmlReader).hasNext();
+ Characters nextEvent = Mockito.mock(Characters.class);
+ doReturn(true).when(nextEvent).isCharacters();
+ doReturn(XmlNodeType.CHARACTERS).when(nextEvent).getEventType();
+ XMLEvent endEvent = Mockito.mock(XMLEvent.class);
+ doReturn(nextEvent).doReturn(endEvent).when(xmlReader).nextEvent();
+ doReturn(true).when(endEvent).isEndElement();
+
+ impl.readValue(true); //must not throw npe even if character.getData() is null
+
+ Assert.assertNull(character.getData());
+ }
+
+ @Test
+ public void testReadValueWhenCharacterDataIsNullForStartElement() throws Exception {
+
+ doReturn(true).when(presentEvent).isStartElement();
+ doReturn(XmlNodeType.CHARACTERS).when(presentEvent).getEventType();
+ doReturn(true).when(presentEvent).isCharacters();
+ doReturn(character).when(presentEvent).asCharacters();
+
+ //next event, then end event, then no more event
+ doReturn(true).doReturn(true).doReturn(false).when(xmlReader).hasNext();
+ Characters nextEvent = Mockito.mock(Characters.class);
+ doReturn(true).when(nextEvent).isCharacters();
+ doReturn(XmlNodeType.CHARACTERS).when(nextEvent).getEventType();
+ XMLEvent endEvent = Mockito.mock(XMLEvent.class);
+ doReturn(nextEvent).doReturn(endEvent).when(xmlReader).nextEvent();
+ doReturn(true).when(endEvent).isEndElement();
+
+ impl.readValue(true); //must not throw npe even if character.getData() is null
+
+ Assert.assertNull(character.getData());
+ }
+
+}
diff --git a/src/test/java/microsoft/exchange/webservices/data/core/LazyMemberTest.java b/src/test/java/microsoft/exchange/webservices/data/core/LazyMemberTest.java
new file mode 100644
index 000000000..a3abf8848
--- /dev/null
+++ b/src/test/java/microsoft/exchange/webservices/data/core/LazyMemberTest.java
@@ -0,0 +1,95 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package microsoft.exchange.webservices.data.core;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class LazyMemberTest {
+
+ LazyMember impl;
+
+ @Mock ILazyMember