Projects >> candlepin >>7710564c302cbf55fdecfa1a7892394230452d8b

Chunk
Conflicting content
    private Map getTestImportFiles() {
        Map importFiles = new HashMap();
<<<<<<< HEAD
=======
        File ruleDir = mock(File.class);
        File[] rulesFiles = new File[]{mock(File.class)};
        when(ruleDir.listFiles()).thenReturn(rulesFiles);

        importFiles.put(ImportFile.META.fileName(), null);
        importFiles.put(ImportFile.RULES.fileName(), ruleDir);
        importFiles.put(ImportFile.CONSUMER_TYPE.fileName(), mock(File.class));
        importFiles.put(ImportFile.CONSUMER.fileName(), mock(File.class));
        importFiles.put(ImportFile.PRODUCTS.fileName(), mock(File.class));
        importFiles.put(ImportFile.ENTITLEMENTS.fileName(), mock(File.class));

        try {
            i.importObjects(owner, importFiles, co);
        }
        catch (ImporterException e) {
            assertEquals(e.getMessage(), i18n.tr("The archive does not contain the " +
                "required meta.json file"));
            return;
        }
        fail();
    }

    @Test
    public void testImportNoRulesDir()
        throws IOException, ImporterException {
        Importer i = new Importer(null, null, null, null, null, null, null,
            null, config, null, null, null, i18n);
        Owner owner = mock(Owner.class);
        ConflictOverrides co = mock(ConflictOverrides.class);
        Map importFiles = new HashMap();

>>>>>>> 87f370d5ffba8d15a07a19f6810fe57fb6e7806a
        importFiles.put(ImportFile.META.fileName(), mock(File.class));
        importFiles.put(ImportFile.RULES_FILE.fileName(), mock(File.class));
        importFiles.put(ImportFile.CONSUMER_TYPE.fileName(), mock(File.class));
Solution content
    private Map getTestImportFiles() {
        Map importFiles = new HashMap();
        importFiles.put(ImportFile.META.fileName(), mock(File.class));
        importFiles.put(ImportFile.RULES_FILE.fileName(), mock(File.class));
        importFiles.put(ImportFile.CONSUMER_TYPE.fileName(), mock(File.class));
File
ImporterTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method invocation
Method signature
Try statement
Variable
Chunk
Conflicting content
        importFiles.put(ImportFile.CONSUMER.fileName(), mock(File.class));
        importFiles.put(ImportFile.PRODUCTS.fileName(), mock(File.class));
        importFiles.put(ImportFile.ENTITLEMENTS.fileName(), mock(File.class));
<<<<<<< HEAD
        return importFiles;
=======

        try {
            i.importObjects(owner, importFiles, co);
        }
        catch (ImporterException e) {
            assertEquals(e.getMessage(), i18n.tr("The archive does not contain the " +
                "required rules directory"));
            return;
        }
        fail();
>>>>>>> 87f370d5ffba8d15a07a19f6810fe57fb6e7806a
    }

    @Test
Solution content
        importFiles.put(ImportFile.CONSUMER.fileName(), mock(File.class));
        importFiles.put(ImportFile.PRODUCTS.fileName(), mock(File.class));
        importFiles.put(ImportFile.ENTITLEMENTS.fileName(), mock(File.class));
        return importFiles;
    }

    @Test
File
ImporterTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Try statement
Variable