Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release to mater #295

Merged
merged 153 commits into from
Mar 14, 2013
Merged
Changes from 7 commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
8a143d8
update the unit tests so that the job integration tests have the right
Jan 14, 2013
624cfa2
add TaskHistoricalEvent to the queue.
Jan 14, 2013
84c6bd5
partial checkin for task historical event
Jan 15, 2013
76d9ecc
initial check in to add task historical event type.
Jan 15, 2013
8e9fdcf
Merge pull request #101 from WindowsAzure/dev
Jan 15, 2013
7d5b4b6
second checkin to support task historical events.
Jan 16, 2013
2cebbbd
Merge pull request #99 from gcheng/bettertests
Jan 21, 2013
c3cfb9f
Merge pull request #626 from gcheng/dev
Jan 21, 2013
6760316
Merge pull request #104 from WindowsAzure/dev
Jan 22, 2013
b76886a
Merge pull request #105 from gcheng/dev
Jan 22, 2013
466c43b
add job integration test for taskhistorical event
Jan 23, 2013
84c47af
Fix JavaDoc build warnings
jcookems Jan 23, 2013
f4d3d60
Fixing checkstyle errors for Media Services, issue #204.
jcookems Jan 23, 2013
a1f7bc6
Merge pull request #4 from jcookems/fixDocWarnings
jcookems Jan 23, 2013
3a63e0e
Update `settingTimeoutPrefixedFromConfigWorks` to test state of the c…
jcookems Jan 23, 2013
baaf794
Removing code to pre-clean tables, because the table names are now un…
jcookems Jan 23, 2013
bd8d7c1
Merge pull request #5 from jcookems/fixCheckStyle
jcookems Jan 23, 2013
84dc395
Convert readField from recursive to iterative.
jcookems Jan 23, 2013
c3a60fb
Merge pull request #6 from jcookems/fix210
jcookems Jan 23, 2013
64b3938
Merge pull request #211 from jcookems/dev
jcookems Jan 23, 2013
cc327c0
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
jcookems Jan 24, 2013
455f906
Merge pull request #631 from jcookems/dev
jcookems Jan 24, 2013
f7dce4b
code review feedback.
Jan 25, 2013
0ef9985
Merge pull request #100 from gcheng/historicalevents
Jan 25, 2013
6db3cad
a missed unit test.
Jan 25, 2013
3531068
Merge pull request #106 from gcheng/historicalevents
Jan 25, 2013
04160b9
Merge pull request #632 from gcheng/dev
Jan 25, 2013
78067fc
Minor changes to address the compile-time warnings
jcookems Jan 28, 2013
7a8812e
Remove trivial TODO comments from tests
jcookems Jan 29, 2013
dda240d
Removing trivial TODO Auto-generated comments
jcookems Jan 29, 2013
40bd3e5
Replace trivial *if* statement with more useful Assert
jcookems Jan 29, 2013
269db3f
Remove "catch (InterruptedException e)" that could obscure unexpected…
jcookems Jan 29, 2013
da209fe
Merge pull request #32 from jcookems/fixWarnings
jcookems Jan 29, 2013
0413d38
Merge pull request #634 from jcookems/dev
jcookems Jan 29, 2013
4bf887e
Remove hard-coded Fiddler code in tests
jcookems Jan 29, 2013
277921f
Adding deltas to assertEquals for Date and Double, which are likely t…
jcookems Jan 29, 2013
4e7c7d4
Updated ignore
Jan 30, 2013
16cd488
Merge branch 'master' of https://github.com/WindowsAzure/azure-sdk-fo…
Jan 30, 2013
68a61bc
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
Jan 30, 2013
5679d73
First cut at base class for connection string parsing.
Jan 31, 2013
88a1f7a
Updated based on code review, rewrite parser based on grammar from Jason
Feb 1, 2013
702c26a
Added back in test that was accidentally removed
Feb 1, 2013
886535a
Merge pull request #5 from christav/servicebus-connection-strings
Feb 1, 2013
13ef42a
Merge pull request #212 from christav/dev
Feb 1, 2013
a98c882
Working towards connection string support in service bus
Feb 1, 2013
50929a6
Connection settings class fully plumbed through config
Feb 1, 2013
d010841
Switched tests to running off connection string instead of individual…
Feb 1, 2013
e001391
Fixed up exception reporting, fixed so tests actually use connection …
Feb 2, 2013
87d5ba9
Adding testing for various configuration permutations.
Feb 4, 2013
959a3c9
Made connection settings package visible rather than public.
Feb 4, 2013
ba3e0f3
Only replace sb:// at start of connection string value
Feb 4, 2013
0f4a168
Merge pull request #6 from christav/servicebus-connection-strings
Feb 5, 2013
9d9e65c
Merge pull request #215 from christav/dev
Feb 5, 2013
fde1416
Adding javadocs for missing parameters
Feb 5, 2013
27be399
Merge pull request #7 from christav/servicebus-javadoc-update
Feb 5, 2013
e35b776
Merge pull request #216 from christav/dev
Feb 5, 2013
614e96e
Merge pull request #33 from jcookems/fix205
jcookems Feb 6, 2013
eaf464c
Merge pull request #639 from jcookems/dev
jcookems Feb 6, 2013
8bca4e7
Removed leaseId from function signature - it isn't used by the service.
Feb 6, 2013
df49d89
initial checkin for user agent filter.
Feb 6, 2013
6faeb7c
get user agent working with media service.
Feb 7, 2013
939e60c
Added return value for breakLease. Also fixed some warnings in the bl…
Feb 7, 2013
3e8b32b
Updated doc comments
Feb 7, 2013
a053200
enable UserAgent in Blob, ServiceBus, Queue and Table.
Feb 7, 2013
b8a9257
fix up of related classes.
Feb 7, 2013
11dc82d
Added back original overloads of breakLease to keep back compat, mark…
Feb 7, 2013
df8140d
Merge pull request #8 from christav/update-breaklease-signature-88
Feb 7, 2013
3fc489f
Merge pull request #228 from christav/dev
Feb 7, 2013
781a0f4
code review feedback.
Feb 8, 2013
8c7ffac
Merge pull request #14 from gcheng/useragent
Feb 8, 2013
fbec962
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
Feb 8, 2013
9b8ab6d
Fixed test cross contamination - create new config, don't reuse curre…
Feb 8, 2013
9cc5440
Merge pull request #9 from christav/connectionstring-test-fixes-232
Feb 8, 2013
79f2e3e
Merge pull request #233 from christav/dev
Feb 8, 2013
55c81f8
resolve a merge conflict.
Feb 8, 2013
686f91c
Minor changes to address the compile-time warnings
jcookems Jan 28, 2013
9c2243a
Remove trivial TODO comments from tests
jcookems Jan 29, 2013
b375ecb
Removing trivial TODO Auto-generated comments
jcookems Jan 29, 2013
2d0299f
Replace trivial *if* statement with more useful Assert
jcookems Jan 29, 2013
5d6f96d
Remove "catch (InterruptedException e)" that could obscure unexpected…
jcookems Jan 29, 2013
5912b78
Remove hard-coded Fiddler code in tests
jcookems Jan 29, 2013
cac506d
Adding deltas to assertEquals for Date and Double, which are likely t…
jcookems Jan 29, 2013
9a44b2d
Merge pull request #240 from gcheng/dev
Feb 11, 2013
2134d76
Fixing new warnings
jcookems Feb 12, 2013
d321286
Merge pull request #7 from jcookems/cleanup1
jcookems Feb 12, 2013
e46ebae
Merge branch 'dev' of github.com:jcookems/azure-sdk-for-java into dev
jcookems Feb 12, 2013
f534e85
Merge pull request #241 from jcookems/dev
jcookems Feb 12, 2013
12e254d
fix an issue on Jason's machine.
Feb 13, 2013
73e1961
Merge pull request #16 from gcheng/useragentfilter
Feb 14, 2013
38ec313
Merge pull request #242 from gcheng/dev
Feb 14, 2013
315f243
Add java test cases for WA GB18030 Certification.
Feb 18, 2013
b208494
1. Fix Copyright info
Feb 19, 2013
03c4f3b
Removed extra print
Feb 19, 2013
c427848
Merge pull request #10 from christav/remove-console-output-244
Feb 19, 2013
ed834aa
Merge pull request #248 from christav/dev
Feb 19, 2013
c744072
fix path in readme file.
Feb 20, 2013
83228b7
Merge pull request #17 from gcheng/readme
Feb 20, 2013
abbbe10
Merge pull request #250 from gcheng/dev
Feb 20, 2013
38b3a52
[JXSCL] : Make OperationContext RequestResults thread safe,
Feb 20, 2013
2f347c3
Merge pull request #247 from LucieZhou/master
jcookems Feb 20, 2013
f5e7c15
CR Feedback - Update tasks to provide result affinity. Now the Reque…
Feb 21, 2013
118bac1
Make BlobOutputStream use latest instead of uncommitted.
Feb 21, 2013
5b39feb
Reduced characters that get encoded to just the illegal set
Feb 22, 2013
3f7bf11
Added surrogate pair character to test
Feb 22, 2013
836828d
Merge pull request #11 from christav/fix-encoding-111
Feb 22, 2013
c4268a5
Merge pull request #258 from christav/dev
Feb 22, 2013
08648cc
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
Feb 22, 2013
36ebeb4
BlobInputStream MD5 verification fix and a couple more fixes
Feb 22, 2013
940a8b6
Pull from WindowsAzure/dev
Feb 22, 2013
11b1a31
CR feedback: Update tasks to provide result affinity
Feb 25, 2013
bed1f7d
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
guangyang Feb 25, 2013
83c5aa8
Fixed test for surrogate pair, removed encoding
Feb 26, 2013
dcc318c
Merge pull request #12 from christav/encoding-111
Feb 26, 2013
98e2a46
Merge pull request #260 from christav/dev
Feb 26, 2013
19ef20c
fix the broken unit test due to nimbus server upgrade.
Feb 26, 2013
4f692bb
fix another unit test due to nimbus server upgrade.
Feb 26, 2013
77c9477
Merge pull request #107 from gcheng/unittestclean
Feb 26, 2013
ce4a3bf
Merge pull request #644 from gcheng/dev
Feb 26, 2013
c99a721
Removed copyright year from javadoc header
Feb 27, 2013
e78d698
Merge pull request #13 from christav/remove-date-256
Feb 27, 2013
53350d6
Merge pull request #261 from christav/dev
Feb 27, 2013
a542d78
Merge pull request #18 from WindowsAzure/dev
Feb 27, 2013
742b0e2
Clean up service bus assets created as part of test at the end.
Feb 27, 2013
731245a
Merge pull request #14 from christav/sb-test-cleanup-118
Feb 27, 2013
dc4575c
Merge pull request #263 from christav/dev
Feb 27, 2013
ff3d149
fix the broken unit test due to nimbus server upgrade.
Feb 26, 2013
34d7de1
fix another unit test due to nimbus server upgrade.
Feb 26, 2013
782319d
CR feedback remove extra line
Feb 27, 2013
cba4c0d
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
Feb 27, 2013
39a498f
fix a broken unit test
Feb 27, 2013
84403a6
Merge pull request #20 from gcheng/fixunittests
Feb 27, 2013
8e7fc15
Merge pull request #264 from gcheng/dev
Feb 27, 2013
c5345f2
Merge branch 'dev' of https://github.com/sozler/azure-sdk-for-java in…
Feb 28, 2013
57335fe
Update Changelog for latest fixes
Feb 28, 2013
b792da2
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
Mar 1, 2013
927e31e
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-j…
Mar 1, 2013
557804b
Merge branch 'dev' of https://github.com/sozler/azure-sdk-for-java in…
Mar 1, 2013
6575ffa
Merge pull request #282 from sozler/dev
Mar 6, 2013
22961d2
Merge branch 'release' of github.com:WindowsAzure/azure-sdk-for-java …
jcookems Mar 8, 2013
6ad950a
Merge branch 'release' of https://github.com/WindowsAzure/azure-sdk-f…
Mar 8, 2013
0145416
Merge pull request #34 from jcookems/int
jcookems Mar 8, 2013
7f614ec
Merge pull request #651 from jcookems/dev
jcookems Mar 8, 2013
48ca51e
Merge pull request #9 from jcookems/int
jcookems Mar 8, 2013
492299f
Merge pull request #290 from jcookems/release
jcookems Mar 8, 2013
398e721
Updating POM version
jcookems Mar 8, 2013
11ec4a9
Merge pull request #291 from jcookems/release
jcookems Mar 8, 2013
5fc77e0
Merge pull request #289 from joeg/devMerge
Mar 9, 2013
b6928e0
Merge branch 'release' of https://github.com/WindowsAzure/azure-sdk-f…
guangyang Mar 11, 2013
baff388
update changelog for 0.4.1
guangyang Mar 11, 2013
1944273
update change log and readme.md based on PR review feedback
guangyang Mar 11, 2013
dd74ec3
fixing policheck issues
guangyang Mar 11, 2013
f0d6ca3
fixing policheck issues
guangyang Mar 11, 2013
e92621b
Merge pull request #292 from guangyang/release
guangyang Mar 11, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@
import com.microsoft.windowsazure.services.media.models.Locator;
import com.microsoft.windowsazure.services.media.models.LocatorInfo;
import com.microsoft.windowsazure.services.media.models.LocatorType;
import com.microsoft.windowsazure.services.media.models.ProtectionKey;
import com.microsoft.windowsazure.services.media.models.Task;
import com.microsoft.windowsazure.services.media.models.Task.CreateBatchOperation;

@@ -288,12 +289,15 @@ public void deleteAssetFailedWithInvalidId() throws ServiceException {
@Test
public void linkAssetContentKeySuccess() throws ServiceException, URISyntaxException {
// Arrange
String originalTestName = testAssetPrefix + "linkAssetContentKeyInvalidIdFailed";
String originalTestName = testAssetPrefix + "linkAssetContentKeySuccess";
AssetInfo assetInfo = service.create(Asset.create().setName(originalTestName)
.setOptions(AssetOption.StorageEncrypted));

String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(ContentKeyType.StorageEncryption));
String contentKeyId = String.format("nb:kid:UUID:%s", UUID.randomUUID());
String encryptedContentKey = "dummyEncryptedContentKey";
service.create(ContentKey.create(contentKeyId, ContentKeyType.StorageEncryption, encryptedContentKey));
service.create(ContentKey.create(contentKeyId, ContentKeyType.StorageEncryption, encryptedContentKey)
.setProtectionKeyId(protectionKeyId));

// Act
service.action(Asset.linkContentKey(assetInfo.getId(), contentKeyId));
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
import com.microsoft.windowsazure.services.media.models.ContentKey;
import com.microsoft.windowsazure.services.media.models.ContentKeyInfo;
import com.microsoft.windowsazure.services.media.models.ContentKeyType;
import com.microsoft.windowsazure.services.media.models.ProtectionKey;
import com.microsoft.windowsazure.services.media.models.ProtectionKeyType;

public class ContentKeyIntegrationTest extends IntegrationTestBase {
@@ -65,32 +66,37 @@ public void canCreateContentKey() throws Exception {
// Arrange
String testCanCreateContentKeyId = createRandomContentKeyId();
String testCanCreateContentKeyName = "testCanCreateContentKey";
String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(testContentKeyType));

// Act
ContentKeyInfo contentKeyInfo = service.create(ContentKey.create(testCanCreateContentKeyId, testContentKeyType,
testEncryptedContentKey).setName(testCanCreateContentKeyName));
ContentKeyInfo contentKeyInfo = service.create(ContentKey
.create(testCanCreateContentKeyId, testContentKeyType, testEncryptedContentKey)
.setName(testCanCreateContentKeyName).setProtectionKeyId(protectionKeyId));

// Assert
verifyContentKeyProperties("ContentKey", testCanCreateContentKeyId, testContentKeyType,
testEncryptedContentKey, testCanCreateContentKeyName, "", ProtectionKeyType.fromCode(0), "",
contentKeyInfo);
testEncryptedContentKey, testCanCreateContentKeyName, protectionKeyId, ProtectionKeyType.fromCode(0),
"", contentKeyInfo);
}

@Test
public void canGetSingleContentKeyById() throws Exception {
// Arrange
String expectedName = testContentKeyPrefix + "GetOne";
String testGetSingleContentKeyByIdId = createRandomContentKeyId();
ContentKeyInfo ContentKeyToGet = service.create(ContentKey.create(testGetSingleContentKeyByIdId,
testContentKeyType, testEncryptedContentKey).setName(expectedName));
String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(testContentKeyType));
ContentKeyInfo ContentKeyToGet = service.create(ContentKey
.create(testGetSingleContentKeyByIdId, testContentKeyType, testEncryptedContentKey)
.setName(expectedName).setProtectionKeyId(protectionKeyId));

// Act
ContentKeyInfo retrievedContentKeyInfo = service.get(ContentKey.get(ContentKeyToGet.getId()));

// Assert
assertEquals(ContentKeyToGet.getId(), retrievedContentKeyInfo.getId());
verifyContentKeyProperties("ContentKey", testGetSingleContentKeyByIdId, testContentKeyType,
testEncryptedContentKey, expectedName, "", ProtectionKeyType.fromCode(0), "", retrievedContentKeyInfo);
testEncryptedContentKey, expectedName, protectionKeyId, ProtectionKeyType.fromCode(0), "",
retrievedContentKeyInfo);
}

@Test
@@ -102,18 +108,22 @@ public void cannotGetSingleContentKeyByInvalidId() throws Exception {

@Test
public void canRetrieveListOfContentKeys() throws Exception {
// Arrange
String[] ContentKeyNames = new String[] { testContentKeyPrefix + "ListOne", testContentKeyPrefix + "ListTwo" };
String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(testContentKeyType));

List<ContentKeyInfo> expectedContentKeys = new ArrayList<ContentKeyInfo>();
for (int i = 0; i < ContentKeyNames.length; i++) {
String testCanRetrieveListOfContentKeysId = createRandomContentKeyId();
ContentKeyInfo contentKey = service.create(ContentKey.create(testCanRetrieveListOfContentKeysId,
testContentKeyType, testEncryptedContentKey));
testContentKeyType, testEncryptedContentKey).setProtectionKeyId(protectionKeyId));
expectedContentKeys.add(contentKey);
}

// Act
List<ContentKeyInfo> actualContentKeys = service.list(ContentKey.list());

// Assert
verifyListResultContains("listContentKeyss", expectedContentKeys, actualContentKeys, new ComponentDelegate() {
@Override
public void verifyEquals(String message, Object expected, Object actual) {
@@ -124,32 +134,41 @@ public void verifyEquals(String message, Object expected, Object actual) {

@Test
public void canUseQueryParametersWhenListingContentKeys() throws Exception {
// Arrange
String[] ContentKeyNames = new String[] { testContentKeyPrefix + "ListThree",
testContentKeyPrefix + "ListFour", testContentKeyPrefix + "ListFive", testContentKeyPrefix + "ListSix",
testContentKeyPrefix + "ListSeven" };
String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(testContentKeyType));

List<ContentKeyInfo> expectedContentKeys = new ArrayList<ContentKeyInfo>();
for (int i = 0; i < ContentKeyNames.length; i++) {
ContentKeyInfo contentKeyInfo = service.create(ContentKey.create(createRandomContentKeyId(),
testContentKeyType, testEncryptedContentKey));
testContentKeyType, testEncryptedContentKey).setProtectionKeyId(protectionKeyId));
expectedContentKeys.add(contentKeyInfo);
}

// Act
List<ContentKeyInfo> actualContentKeys = service.list(ContentKey.list().setTop(2));

// Assert
assertEquals(2, actualContentKeys.size());
}

@Test
public void canDeleteContentKeyById() throws Exception {
// Arrange
String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(testContentKeyType));
String contentKeyName = testContentKeyPrefix + "ToDelete";
ContentKeyInfo contentKeyToDelete = service.create(ContentKey.create(createRandomContentKeyId(),
testContentKeyType, testEncryptedContentKey).setName(contentKeyName));
ContentKeyInfo contentKeyToDelete = service.create(ContentKey
.create(createRandomContentKeyId(), testContentKeyType, testEncryptedContentKey)
.setName(contentKeyName).setProtectionKeyId(protectionKeyId));
List<ContentKeyInfo> listContentKeysResult = service.list(ContentKey.list());
int ContentKeyCountBaseline = listContentKeysResult.size();

// Act
service.delete(ContentKey.delete(contentKeyToDelete.getId()));

// Assert
listContentKeysResult = service.list(ContentKey.list());
assertEquals("listPoliciesResult.size", ContentKeyCountBaseline - 1, listContentKeysResult.size());

Original file line number Diff line number Diff line change
@@ -301,7 +301,6 @@ public void canGetTasksFromJob() throws Exception {

@Test
public void canGetErrorDetailsFromTask() throws Exception {
cleanupEnvironment();
String name = testJobPrefix + "canGetErrorDetailsFromTask";

JobInfo actualJob = service.create(Job.create().setName(name).addInputMediaAsset(assetInfo.getId())
Original file line number Diff line number Diff line change
@@ -73,6 +73,6 @@ public void listMediaProcessorWithOptionSuccess() throws ServiceException {
assertEquals("listMediaProcessors size", 1, listMediaProcessorsResult.size());
MediaProcessorInfo mediaProcessorInfo = listMediaProcessorsResult.get(0);
verifyMediaProcessorInfo("mediaProcessorInfo", "nb:mpid:UUID:aec03716-7c5e-4f68-b592-f4850eba9f10",
"Storage Decryption", "Storage Decryption", "", "Microsoft", "1.5.3", mediaProcessorInfo);
"Storage Decryption", "Storage Decryption", "", "Microsoft", "1.5.3.0", mediaProcessorInfo);
}
}
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ public void createTaskSuccess() throws ServiceException, UnsupportedEncodingExce
// Optional parameters
String configuration = new String(Base64.encode(commonConfiguration), "UTF8");
String name = "My encoding Task " + UUID.randomUUID().toString();
int priority = 0;
int jobPriority = 3;
TaskOption options = TaskOption.ProtectedConfiguration;
// Use a fake id, to simulate real use.
String encryptionKeyId = "nb:kid:UUID:" + UUID.randomUUID().toString();
@@ -81,7 +81,7 @@ public void createTaskSuccess() throws ServiceException, UnsupportedEncodingExce
String initializationVector = new String(Base64.encode(new byte[16]), "UTF8");

CreateBatchOperation taskCreator = Task.create(mediaProcessorId, taskBody).setConfiguration(configuration)
.setName(name).setPriority(priority).setOptions(options).setEncryptionKeyId(encryptionKeyId)
.setName(name).setPriority(jobPriority).setOptions(options).setEncryptionKeyId(encryptionKeyId)
.setEncryptionScheme(encryptionScheme).setEncryptionVersion(encryptionVersion)
.setInitializationVector(initializationVector);
jobCreator.addTaskCreator(taskCreator);
@@ -92,8 +92,9 @@ public void createTaskSuccess() throws ServiceException, UnsupportedEncodingExce

// Assert
assertEquals("taskInfos count", 1, taskInfos.size());
verifyTaskPropertiesJustStarted("taskInfo", mediaProcessorId, options, taskBody, configuration, name, priority,
encryptionKeyId, encryptionScheme, encryptionVersion, initializationVector, taskInfos.get(0));
verifyTaskPropertiesJustStarted("taskInfo", mediaProcessorId, options, taskBody, configuration, name,
jobPriority, encryptionKeyId, encryptionScheme, encryptionVersion, initializationVector,
taskInfos.get(0));
}

@Test
@@ -108,7 +109,7 @@ public void createTwoTasksSuccess() throws ServiceException {
String configuration = commonConfiguration;
String baseName = "My encoding Task " + UUID.randomUUID().toString();
String[] suffixes = new String[] { " 1", " 2" };
int priority = 0;
int jobPriority = 3;
TaskOption options = TaskOption.None;

List<CreateBatchOperation> taskCreators = new ArrayList<CreateBatchOperation>();
@@ -128,7 +129,7 @@ public void createTwoTasksSuccess() throws ServiceException {
assertEquals("taskInfos count", taskCreators.size(), taskInfos.size());
for (int i = 0; i < taskCreators.size(); i++) {
verifyTaskPropertiesJustStartedNoEncryption("taskInfo", mediaProcessorId, options, taskBodies[i],
configuration, baseName + suffixes[i], priority, taskInfos.get(i));
configuration, baseName + suffixes[i], jobPriority, taskInfos.get(i));
}
}

@@ -184,7 +185,7 @@ public void cancelTaskSuccess() throws ServiceException, InterruptedException {
List<TaskInfo> taskInfos = service.list(Task.list(cancellingJobInfo.getTasksLink()));
for (TaskInfo taskInfo : taskInfos) {
verifyTaskPropertiesNoEncryption("canceled task", mediaProcessorId, TaskOption.None, taskBody,
configuration, name, 0, new Date(), null, 0.0, 0.0, null, TaskState.Canceled, taskInfo);
configuration, name, 3, new Date(), null, 0.0, 0.0, null, TaskState.Canceled, taskInfo);
}
}

Original file line number Diff line number Diff line change
@@ -278,7 +278,7 @@ public Task.CreateBatchOperation createTaskOptions(String taskName, int inputAss
configuration = "VC1 Broadband SD 4x3";
break;
case StorageDecryption:
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_STORAGE_DECRYPTION, "1.5.3");
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_STORAGE_DECRYPTION, "1.5.3.0");
configuration = null;
break;
default: