From 1869bf8a2d5a9dbfbacab84d2cf5617ccbb39ee1 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 28 Jun 2013 13:35:32 -0700 Subject: [PATCH 1/2] reduce the chance of potential unit test failure. --- .../scenarios/MediaServiceScenarioTest.java | 6 ++++-- .../services/scenarios/MediaServiceWrapper.java | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceScenarioTest.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceScenarioTest.java index 41bc23269dab..0d4ef704f223 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceScenarioTest.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceScenarioTest.java @@ -40,6 +40,7 @@ public class MediaServiceScenarioTest extends ScenarioTestBase { private static final String rootTestAssetPrefix = "testAssetPrefix-"; + private static final String testJobPrefix = "testJobPrefix"; private static String testAssetPrefix; private static MediaServiceWrapper wrapper; private static MediaServiceValidation validator; @@ -57,6 +58,7 @@ public static void setup() throws ServiceException { public static void cleanup() throws ServiceException { wrapper.removeAllAssetsWithPrefix(rootTestAssetPrefix); wrapper.removeAllAccessPoliciesWithPrefix(); + wrapper.removeAllJobWithPrefix(testJobPrefix); } @Test @@ -119,7 +121,7 @@ public void createJob() throws Exception { wrapper.uploadFilesToAsset(asset, 10, getTestAssetFiles()); signalSetupFinished(); - String jobName = "my job createJob" + UUID.randomUUID().toString(); + String jobName = testJobPrefix + UUID.randomUUID().toString(); JobInfo job = wrapper.createJob(jobName, asset, createTasks()); validator.validateJob(job, jobName, asset, createTasks()); } @@ -129,7 +131,7 @@ public void transformAsset() throws Exception { signalSetupStarting(); AssetInfo asset = wrapper.createAsset(testAssetPrefix + "transformAsset", AssetOption.None); wrapper.uploadFilesToAsset(asset, 10, getTestAssetFiles()); - String jobName = "my job transformAsset" + UUID.randomUUID().toString(); + String jobName = testJobPrefix + UUID.randomUUID().toString(); JobInfo job = wrapper.createJob(jobName, asset, wrapper.createTaskOptions("Transform", 0, 0, EncoderType.WindowsAzureMediaEncoder)); diff --git a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java index bb996eb10b77..8b8779d173b5 100644 --- a/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java +++ b/microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/scenarios/MediaServiceWrapper.java @@ -432,6 +432,19 @@ public void removeAllAccessPoliciesWithPrefix() throws ServiceException { } } + public void removeAllJobWithPrefix(String testJobPrefix) throws ServiceException { + List jobInfos = service.list(Job.list()); + for (JobInfo jobInfo : jobInfos) { + if (jobInfo.getName().startsWith(testJobPrefix)) { + try { + service.delete(Job.delete(jobInfo.getId())); + } + catch (ServiceException e) { + } + } + } + } + private static class EncryptionHelper { public static boolean canUseStrongCrypto() { try { From 02c8337c8979a5fc2efc65b49e80eaa3f73caf39 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 15 Jul 2013 12:38:25 -0700 Subject: [PATCH 2/2] remove warnings! --- .../windowsazure/services/serviceBus/Util.java | 18 ++++++++---------- .../table/implementation/TableRestProxy.java | 3 --- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java index 026cb9c51771..128e23fe2f50 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/Util.java @@ -2,15 +2,15 @@ * Copyright Microsoft Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.microsoft.windowsazure.services.serviceBus; @@ -20,12 +20,10 @@ public class Util { public static Iterable iterateQueues(ServiceBusContract service) throws ServiceException { - // TODO: iterate over link rel=next pagination return service.listQueues().getItems(); } public static Iterable iterateTopics(ServiceBusContract service) throws ServiceException { - // TODO: iterate over link rel=next pagination return service.listTopics().getItems(); } } diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/table/implementation/TableRestProxy.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/table/implementation/TableRestProxy.java index 0daec9926c02..93cfbc41eb62 100644 --- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/table/implementation/TableRestProxy.java +++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/table/implementation/TableRestProxy.java @@ -157,7 +157,6 @@ private void ThrowIfError(ClientResponse r) { } private String encodeODataURIValue(String value) { - //TODO: Unclear if OData value in URI's need to be encoded or not return value; } @@ -757,7 +756,6 @@ private DataSource createBatchInsertOrUpdateEntityPart(String table, Entity enti headers.addHeader("If-Match", entity.getEtag()); } - //TODO: Review code to make sure encoding is correct ByteArrayOutputStream httpRequest = new ByteArrayOutputStream(); httpReaderWriter.appendMethod(httpRequest, verb, path); httpReaderWriter.appendHeaders(httpRequest, headers); @@ -780,7 +778,6 @@ private DataSource createBatchDeleteEntityPart(String table, String partitionKey headers.addHeader("Content-ID", Integer.toString(contentId)); headers.addHeader("If-Match", etag == null ? "*" : etag); - //TODO: Review code to make sure encoding is correct ByteArrayOutputStream httpRequest = new ByteArrayOutputStream(); httpReaderWriter.appendMethod(httpRequest, "DELETE", path); httpReaderWriter.appendHeaders(httpRequest, headers);