Projects >> azure-sdk-for-java >>71b29a9bb672cd6914471f819c149cae628c9e70

Chunk
Conflicting content 
>>>>>>> a0ec86d5982e11c1142d1d174c0901b32e3a8665
import com.microsoft.windowsazure.services.media.models.UpdateLocatorOptions;

public class MediaServiceIntegrationTest extends IntegrationTestBase {
<<<<<<< HEAD
    private static MediaContract service;
    private static String testAssetPrefix = "testAsset";
=======
    private MediaContract service;

    private static final String testAssetPrefix = "testAsset";
    private static String fakeAssetId = "nb:cid:UUID:00000000-0000-4a00-0000-000000000000";

    @Rule
Solution content 
import com.microsoft.windowsazure.services.media.models.UpdateLocatorOptions;

public class MediaServiceIntegrationTest extends IntegrationTestBase {
    private static MediaContract service;

    private static final String testAssetPrefix = "testAsset";
    private static String fakeAssetId = "nb:cid:UUID:00000000-0000-4a00-0000-000000000000";

    @Rule
File
MediaServiceIntegrationTest.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private static void cleanupEnvironment() throws ServiceException {
        config = createConfig();
        MediaContract service = MediaService.create(config);
        removeAllAssets();
        removeAllLocators();
    }

    private static Configuration createConfig() {
        Configuration config = Configuration.getInstance();
        overrideWithEnv(config, MediaConfiguration.URI);
        overrideWithEnv(config, MediaConfiguration.OAUTH_URI);
        overrideWithEnv(config, MediaConfiguration.OAUTH_CLIENT_ID);
        overrideWithEnv(config, MediaConfiguration.OAUTH_CLIENT_SECRET);
        overrideWithEnv(config, MediaConfiguration.OAUTH_SCOPE);
        return config;
    }

=======
>>>>>>> a0ec86d5982e11c1142d1d174c0901b32e3a8665
    private void verifyAssetProperties(String message, String testName, String altId,
            EncryptionOption encryptionOption, AssetState assetState, AssetInfo actualAsset) {
        assertNotNull(message, actualAsset);
Solution content 
        }
    }

    private static Configuration createConfig() {
        Configuration config = Configuration.getInstance();
        overrideWithEnv(config, MediaConfiguration.URI);
        overrideWithEnv(config, MediaConfiguration.OAUTH_URI);
        overrideWithEnv(config, MediaConfiguration.OAUTH_CLIENT_ID);
        overrideWithEnv(config, MediaConfiguration.OAUTH_CLIENT_SECRET);
        overrideWithEnv(config, MediaConfiguration.OAUTH_SCOPE);
        return config;
    }

    private static void cleanupEnvironment() throws ServiceException {
        config = createConfig();
        MediaContract service = MediaService.create(config);
        removeAllAssets();
        removeAllLocators();
    }

    private static Configuration createConfig() {
        Configuration config = Configuration.getInstance();
        overrideWithEnv(config, MediaConfiguration.URI);
        overrideWithEnv(config, MediaConfiguration.OAUTH_URI);
        overrideWithEnv(config, MediaConfiguration.OAUTH_CLIENT_ID);
        overrideWithEnv(config, MediaConfiguration.OAUTH_CLIENT_SECRET);
        overrideWithEnv(config, MediaConfiguration.OAUTH_SCOPE);
        return config;
    }

    private void verifyAssetProperties(String message, String testName, String altId,
            EncryptionOption encryptionOption, AssetState assetState, AssetInfo actualAsset) {
        assertNotNull(message, actualAsset);
File
MediaServiceIntegrationTest.java
Developer's decision
Manual
Kind of conflict
Method declaration
Chunk
Conflicting content 
            service.createAsset(name, options);
        }
    public void listAssetSuccess() throws ServiceException {
        // Arrange
        Collection listAssetResultBaseLine = service.listAssets();
<<<<<<< HEAD
        CreateAssetOptions createAssetOptions = new CreateAssetOptions();
        service.createAsset(createAssetOptions.setName(testAssetPrefix + "assetA"));
        service.createAsset(createAssetOptions.setName(testAssetPrefix + "assetB"));
=======
        String altId = "altId";
        EncryptionOption encryptionOption = EncryptionOption.StorageEncrypted;
        AssetState assetState = AssetState.Published;
        CreateAssetOptions options = new CreateAssetOptions().setAlternateId(altId).setOptions(encryptionOption)
                .setState(assetState);

        String[] assetNames = new String[] { testAssetPrefix + "assetA", testAssetPrefix + "assetB" };
        for (String name : assetNames) {
>>>>>>> a0ec86d5982e11c1142d1d174c0901b32e3a8665

        // Act
        Collection listAssetResult = service.listAssets();
Solution content 
    public void listAssetSuccess() throws ServiceException {
        // Arrange
        Collection listAssetResultBaseLine = service.listAssets();
        CreateAssetOptions createAssetOptions = new CreateAssetOptions();
        service.createAsset(createAssetOptions.setName(testAssetPrefix + "assetA"));
        service.createAsset(createAssetOptions.setName(testAssetPrefix + "assetB"));

        // Act
        Collection listAssetResult = service.listAssets();
File
MediaServiceIntegrationTest.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
    public void deleteAssetSuccess() throws Exception {
        // Arrange
        String assetName = "deleteAssetSuccess";
<<<<<<< HEAD
        CreateAssetOptions createAssetOptions = new CreateAssetOptions().setName(assetName);
        AssetInfo assetInfo = service.createAsset(createAssetOptions);
        List listAssetsResult = service.listAssets(null);
=======
        AssetInfo assetInfo = service.createAsset(assetName);
        List listAssetsResult = service.listAssets();
>>>>>>> a0ec86d5982e11c1142d1d174c0901b32e3a8665
        int assetCountBaseline = listAssetsResult.size();

        // Act
Solution content 
    public void deleteAssetSuccess() throws Exception {
        // Arrange
        String assetName = "deleteAssetSuccess";
        CreateAssetOptions createAssetOptions = new CreateAssetOptions().setName(assetName);
        AssetInfo assetInfo = service.createAsset(createAssetOptions);
        List listAssetsResult = service.listAssets();
        int assetCountBaseline = listAssetsResult.size();

        // Act
File
MediaServiceIntegrationTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable