Projects >> atlas-feeds >>fb0f64b38f99d0479a3a7798758e673fd92394ca

Chunk
Conflicting content 
    private static final String ENGLISH_LANG = "en";
    private static final String GAELIC_LANG = "gla";
    private static final String BRITISH_SIGN_LANGUAGE = "bfi";
<<<<<<< HEAD
    private static final String LANGUAGE = "en";
=======
    private static final String ALBA_CHANNEL = "http://ref.atlasapi.org/channels/bbcalba";
>>>>>>> e53d4c0af781939b3f478901720f4976cf8a4145

    private final IdGenerator idGenerator;
Solution content 
    private static final String ENGLISH_LANG = "en";
    private static final String GAELIC_LANG = "gla";
    private static final String BRITISH_SIGN_LANGUAGE = "bfi";
    private static final String LANGUAGE = "en";
    private static final String ALBA_CHANNEL = "http://ref.atlasapi.org/channels/bbcalba";

    private final IdGenerator idGenerator;
File
NitroOnDemandLocationGenerator.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
        onDemand.setServiceIDRef(DEV_YOUVIEW_SERVICE);
        onDemand.setProgram(generateProgram(hierarchy.item(), hierarchy.version()));
        onDemand.setInstanceMetadataId(imi);
<<<<<<< HEAD
        onDemand.setInstanceDescription(generateInstanceDescription(hierarchy.encoding()));
        onDemand.setPublishedDuration(generatePublishedDuration(hierarchy.version()));
        onDemand.setStartOfAvailability(generateAvailabilityStart(hierarchy.location()));
        onDemand.setEndOfAvailability(generateAvailabilityEnd(hierarchy.location()));
=======
        onDemand.setInstanceDescription(generateInstanceDescription(encoding, languageFor(item)));
        onDemand.setPublishedDuration(generatePublishedDuration(version));
        onDemand.setStartOfAvailability(generateAvailabilityStart(location));
        onDemand.setEndOfAvailability(generateAvailabilityEnd(location));
>>>>>>> e53d4c0af781939b3f478901720f4976cf8a4145
        onDemand.setFree(generateFree());
        onDemand.setLang(LANGUAGE);
Solution content 
        onDemand.setServiceIDRef(DEV_YOUVIEW_SERVICE);
        onDemand.setProgram(generateProgram(hierarchy.item(), hierarchy.version()));
        onDemand.setInstanceMetadataId(imi);
        onDemand.setInstanceDescription(generateInstanceDescription(hierarchy.encoding(), languageFor(hierarchy.item())));
        onDemand.setPublishedDuration(generatePublishedDuration(hierarchy.version()));
        onDemand.setStartOfAvailability(generateAvailabilityStart(hierarchy.location()));
        onDemand.setEndOfAvailability(generateAvailabilityEnd(hierarchy.location()));
        onDemand.setFree(generateFree());
        onDemand.setLang(LANGUAGE);
File
NitroOnDemandLocationGenerator.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
<<<<<<< HEAD
    
=======

    @Test
        assertEquals(true, audioLanguage.isSupplemental());
        assertEquals("dubbed", audioLanguage.getType());
    }
    public void testGaelicLanguageIsSetForAlbaChannel() {
        Film film = createAlbaNitroFilm();

        ExtendedOnDemandProgramType onDemand = (ExtendedOnDemandProgramType) Iterables.getOnlyElement(generator.generate(film));

        InstanceDescriptionType instanceDesc = onDemand.getInstanceDescription();
        CaptionLanguageType captionLanguage = Iterables.getOnlyElement(instanceDesc.getCaptionLanguage());

        assertTrue(captionLanguage.isClosed());
        assertEquals(captionLanguage.getValue(), "gla");
    }

>>>>>>> e53d4c0af781939b3f478901720f4976cf8a4145
    private ItemOnDemandHierarchy hierarchyFrom(Film film) {
        Version version = Iterables.getOnlyElement(film.getVersions());
        Encoding encoding = Iterables.getOnlyElement(version.getManifestedAs());
Solution content 
        assertEquals(true, audioLanguage.isSupplemental());
        assertEquals("dubbed", audioLanguage.getType());
    }

    @Test
    public void testGaelicLanguageIsSetForAlbaChannel() {
        Film film = createAlbaNitroFilm();

        ItemOnDemandHierarchy hierarchy = hierarchyFrom(film);
        String onDemandImi = idGenerator.generateOnDemandImi(hierarchy.item(), hierarchy.version(), hierarchy.encoding(), hierarchy.location());
        ExtendedOnDemandProgramType onDemand = (ExtendedOnDemandProgramType) generator.generate(hierarchy, onDemandImi);

        InstanceDescriptionType instanceDesc = onDemand.getInstanceDescription();
        CaptionLanguageType captionLanguage = Iterables.getOnlyElement(instanceDesc.getCaptionLanguage());

        assertTrue(captionLanguage.isClosed());
        assertEquals(captionLanguage.getValue(), "gla");
    }

    private ItemOnDemandHierarchy hierarchyFrom(Film film) {
        Version version = Iterables.getOnlyElement(film.getVersions());
        Encoding encoding = Iterables.getOnlyElement(version.getManifestedAs());
File
NitroOnDemandLocationGeneratorTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Method declaration