diff --git a/.gitignore b/.gitignore index f49213b91..27c0e9a1e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,11 +15,16 @@ # User-specific stuff: .idea/workspace.xml .idea/tasks.xml +.idea/findbugs-idea.xml +.idea/codeStyleSettings.xml .idea/dictionaries +.idea/shelf *.iws +*.ipr # 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 +.idea/uiDesigner.xml +.idea/* diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index fbf4d0404..ddacdf3e8 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -3,20 +3,73 @@ - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml deleted file mode 100644 index e8a6a9f91..000000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_11.xml b/.idea/libraries/Maven__junit_junit_4_11.xml deleted file mode 100644 index f33320d8e..000000000 --- a/.idea/libraries/Maven__junit_junit_4_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_5.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_5.xml deleted file mode 100644 index 5601459cf..000000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_3.xml deleted file mode 100644 index a821fc2fd..000000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 9ad07365d..f9a9cf069 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,54 @@ +# 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 # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: false # default: false + - https://webhooks.gitter.im/e/04643d955d03eb39e24e + on_success: change + +before_install: + - chmod +x ./deploy_snapshot.sh + +after_success: + - ./deploy_snapshot.sh diff --git a/deploy_snapshot.sh b/deploy_snapshot.sh new file mode 100644 index 000000000..6d9ffd47f --- /dev/null +++ b/deploy_snapshot.sh @@ -0,0 +1,48 @@ +#!/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_BRANCH" != "master" ]; then + echo "[DEPLOY] Skipping snapshot deployment for branch:'$TRAVIS_BRANCH'." +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 + else + echo "[INFO] Deploying signed artifacts" + mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true -Dgpg.passphrase=$GPG_PASSPHRASE + fi + # clean up + rm -f $HOME/.m2/settings.xml +fi diff --git a/ews-java-api.iml b/ews-java-api.iml index e90b18dac..cbb85ce64 100644 --- a/ews-java-api.iml +++ b/ews-java-api.iml @@ -6,17 +6,26 @@ + - - - + + + + - + + + + + + + + - \ No newline at end of file + 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 b1c948d8e..d839caf39 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,37 @@ + 4.0.0 - com.microsoft.office + com.microsoft.ews-java-api ews-java-api - 1.3-SNAPSHOT - - Exchange Web Services Java API - Exchange Web Services (EWS) Java API + + 2.0.2-SNAPSHOT http://www.microsoft.com/ @@ -27,65 +49,293 @@ Microsoft http://www.microsoft.com/ - + + + de.ebf + maven.parent + 0.3.0 + + + + + ebf-releases + http://repository.dev.ebf.de/nexus/content/repositories/releases/ + + always + false + + + + ebf-snapshots + http://repository.dev.ebf.de/nexus/content/repositories/snapshots/ + + always + true + + + + UTF-8 1.6 + + + + 1.6 + 2.10.3 + 3.3 + 1.6.5 + 2.4 + 1.14 + 1.1 + + 3.4 + 2.8 + 2.1 + 2.5 + 2.18.1 + + 4.4.1 + 4.4.1 + 1.2 + 2.7 + 3.3.2 + + 4.12 + 1.3 + 1.10.19 + 1.7.12 + 1.1.3 + + + + default-jdk18-profile + + [1.8,) + + + -Xdoclint:none + + + + 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 + + + + + ebf-releases-deployment + Internal Releases + http://repository.dev.ebf.de/nexus/content/repositories/releases/ + + + ebf-snapshots-deployment + Internal Releases + http://repository.dev.ebf.de/nexus/content/repositories/snapshots/ + + + org.apache.httpcomponents httpclient - 4.3.5 + ${httpclient.version} org.apache.httpcomponents httpcore - 4.3.3 + ${httpcore.version} commons-logging commons-logging - 1.2 + ${commons-logging.version} + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} joda-time joda-time - 2.7 + ${joda-time.version} junit junit - 4.11 + ${junit.version} test org.hamcrest hamcrest-all - 1.3 + ${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 + + 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 + + + + + Maven @@ -11,10 +35,8 @@ - - 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/data/BaseTest.java b/src/test/java/microsoft/exchange/webservices/data/BaseTest.java deleted file mode 100644 index 8262b8f08..000000000 --- a/src/test/java/microsoft/exchange/webservices/data/BaseTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/************************************************************************** - Exchange Web Services Java API - Copyright (c) Microsoft Corporation - All rights reserved. - MIT License - 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; - -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/data/EmailAddressTest.java b/src/test/java/microsoft/exchange/webservices/data/EmailAddressTest.java deleted file mode 100644 index 994a68fed..000000000 --- a/src/test/java/microsoft/exchange/webservices/data/EmailAddressTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************** - Exchange Web Services Java API - Copyright (c) Microsoft Corporation - All rights reserved. - MIT License - 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; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -@RunWith(JUnit4.class) -public class EmailAddressTest { - - @Test - public void testEmailAddressToString() { - Assert.assertTrue(EwsUtilities.stringEquals(null, null)); - EmailAddress address = new EmailAddress(); - address.setAddress("ews@ews.com"); - Assert.assertEquals(address.toString(), "ews@ews.com"); - address.setName("ews"); - Assert.assertEquals(address.toString(), "ews "); - } - -} 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 24e28a332..000000000 --- a/src/test/java/microsoft/exchange/webservices/data/EwsUtilitiesTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/************************************************************************** - Exchange Web Services Java API - Copyright (c) Microsoft Corporation - All rights reserved. - MIT License - 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; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -@RunWith(JUnit4.class) -public class EwsUtilitiesTest { - @Test - public void testGetBuildVersion() { - Assert.assertEquals("Build version must be 0s", "0.0.0.0", EwsUtilities.getBuildVersion()); - } - - @Test - public void testStringEquals() { - Assert.assertTrue(EwsUtilities.stringEquals(null, null)); - Assert.assertTrue(EwsUtilities.stringEquals("x", "x")); - - Assert.assertFalse(EwsUtilities.stringEquals(null, "x")); - Assert.assertFalse(EwsUtilities.stringEquals("x", null)); - Assert.assertFalse(EwsUtilities.stringEquals("x", "X")); - } -} diff --git a/src/test/java/microsoft/exchange/webservices/data/GetUserSettingsRequestTest.java b/src/test/java/microsoft/exchange/webservices/data/GetUserSettingsRequestTest.java deleted file mode 100644 index d7de1f227..000000000 --- a/src/test/java/microsoft/exchange/webservices/data/GetUserSettingsRequestTest.java +++ /dev/null @@ -1,172 +0,0 @@ -/************************************************************************** - Exchange Web Services Java API - Copyright (c) Microsoft Corporation - All rights reserved. - MIT License - 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; - - -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 writen to the Outputstream if expectPartnerToken is not set - * - * @throws ServiceValidationException - * @throws XMLStreamException - * @throws ServiceXmlSerializationException - */ - @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 writen 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 writen to the outputstream - Assert.assertArrayEquals(byteArrayOutputStream.toByteArray(), new ByteArrayOutputStream().toByteArray()); - } - - /** - * Test if content is added correctly if expectPartnerToken is set - * - * @throws ServiceValidationException - * @throws XMLStreamException - * @throws ServiceXmlSerializationException - */ - @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 - * @throws ServiceXmlSerializationException - */ - @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/TaskTest.java b/src/test/java/microsoft/exchange/webservices/data/TaskTest.java deleted file mode 100644 index f0fac655e..000000000 --- a/src/test/java/microsoft/exchange/webservices/data/TaskTest.java +++ /dev/null @@ -1,154 +0,0 @@ -/************************************************************************** - Exchange Web Services Java API - Copyright (c) Microsoft Corporation - All rights reserved. - MIT License - 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; - -import org.hamcrest.core.IsEqual; -import org.hamcrest.core.IsInstanceOf; -import org.hamcrest.core.IsNot; -import org.hamcrest.core.IsNull; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -import static org.junit.Assert.assertThat; - -/** - * Testclass for methods of Task - */ -@RunWith(JUnit4.class) -public class TaskTest extends BaseTest { - - /** - * Mock for the Task - */ - private Task taskMock; - - /** - * Setup Mocks - * - * @throws Exception - */ - @Before - public void setup() throws Exception { - this.taskMock = new Task(TaskTest.exchangeServiceMock); - } - - /** - * Test for reading the value before it is assigned - * - * @throws Exception - */ - @Test(expected = ServiceObjectPropertyException.class) - public void testInitialValuePercent() throws Exception { - taskMock.getPercentComplete(); - } - - /** - * Test for adding 0.0 as percentCompleted - * - * @throws Exception - */ - @Test - public void testAddZeroPercent() throws Exception { - final Double targetValue = 0.0; - taskMock.setPercentComplete(targetValue); - - assertThat(taskMock.getPercentComplete(), IsNot.not(IsNull.nullValue())); - assertThat(taskMock.getPercentComplete(), IsInstanceOf.instanceOf(Double.class)); - assertThat(taskMock.getPercentComplete(), IsEqual.equalTo(targetValue)); - } - - /** - * Test for adding 100.0 as percentCompleted - * - * @throws Exception - */ - @Test - public void testAdd100Percent() throws Exception { - final Double targetValue = 100.0; - taskMock.setPercentComplete(targetValue); - - assertThat(taskMock.getPercentComplete(), IsNot.not(IsNull.nullValue())); - assertThat(taskMock.getPercentComplete(), IsInstanceOf.instanceOf(Double.class)); - assertThat(taskMock.getPercentComplete(), IsEqual.equalTo(targetValue)); - } - - /** - * Test for adding Double.MAX_VALUE as percentCompleted - * - * @throws Exception - */ - @Test(expected = IllegalArgumentException.class) - public void testAddMaxDoublePercent() throws Exception { - final Double targetValue = Double.MAX_VALUE; - taskMock.setPercentComplete(targetValue); - } - - /** - * Test for adding -0.1 as percentCompleted - * - * @throws Exception - */ - @Test(expected = IllegalArgumentException.class) - public void testAddInvalidPercent() throws Exception { - final Double targetValue = -0.1; - taskMock.setPercentComplete(targetValue); - } - - /** - * Test for adding +100.1 as percentCompleted - * - * @throws Exception - */ - @Test(expected = IllegalArgumentException.class) - public void testAddInvalidPercent2() throws Exception { - final Double targetValue = +100.1; - taskMock.setPercentComplete(targetValue); - } - - /** - * Test for adding Double.NaN as percentCompleted - * - * @throws Exception - */ - @Test(expected = IllegalArgumentException.class) - public void testAddNanDoublePercent() throws Exception { - final Double targetValue = Double.NaN; // closest Value to Zero - taskMock.setPercentComplete(targetValue); - } - - /** - * Test for checking if the value changes in case of a thrown exception - * - * @throws Exception - */ - @Test - public void testDontChangeValueOnException() throws Exception { - // set valid value - final Double targetValue = 50.5; - taskMock.setPercentComplete(targetValue); - - assertThat(taskMock.getPercentComplete(), IsNot.not(IsNull.nullValue())); - assertThat(taskMock.getPercentComplete(), IsInstanceOf.instanceOf(Double.class)); - assertThat(taskMock.getPercentComplete(), IsEqual.equalTo(targetValue)); - - final Double invalidValue = -0.1; - try { - taskMock.setPercentComplete(invalidValue); - } catch (IllegalArgumentException ex) { - // ignored - } - - assertThat(taskMock.getPercentComplete(), IsNot.not(IsNull.nullValue())); - assertThat(taskMock.getPercentComplete(), IsInstanceOf.instanceOf(Double.class)); - assertThat(taskMock.getPercentComplete(), IsEqual.equalTo(targetValue)); - } -} diff --git a/src/test/java/microsoft/exchange/webservices/data/TimeSpanTest.java b/src/test/java/microsoft/exchange/webservices/data/TimeSpanTest.java deleted file mode 100644 index 724a5a57d..000000000 --- a/src/test/java/microsoft/exchange/webservices/data/TimeSpanTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/************************************************************************** - Exchange Web Services Java API - Copyright (c) Microsoft Corporation - All rights reserved. - MIT License - 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; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -import java.util.Calendar; -import java.util.GregorianCalendar; - -/** - * The Class TimeSpanTest. - */ -@RunWith(JUnit4.class) -public class TimeSpanTest extends BaseTest { - - /** - * testTimeSpanToXSDuration - */ - @Test - public void testTimeSpanToXSDuration() { - Calendar calendar = new GregorianCalendar(2008, Calendar.OCTOBER, 10); - timeSpanToXSDuration(calendar); - } - - /** - * Time span to xs duration. - * - * @param timeSpan the time span - * @return the string - */ - public String timeSpanToXSDuration(Calendar timeSpan) { - String offsetStr = (timeSpan.SECOND < 0) ? "-" : ""; - String obj = String.format("%s %s %s %s %s ", offsetStr, Math - .abs(timeSpan.DAY_OF_MONTH), Math.abs(timeSpan.HOUR_OF_DAY), - Math.abs(timeSpan.MINUTE), Math.abs(timeSpan.SECOND) + "." + - Math.abs(timeSpan.MILLISECOND)); - - return obj; - } -} 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