Projects >> ceylon-compiler >>0605ebc76c9643743a3307e1dea1cb611d6176c0

Chunk
Conflicting content 
        assertDeprecated(destDir);
        assertTagged(destDir);
        assertDocumentationOfRefinedMember(destDir);
<<<<<<< HEAD
        assertBug659ShowInheritedMembers(destDir);
=======
        assertSequencedParameter(destDir);
>>>>>>> dcf25f5a8a64af47de42f76028a3c455f6678553
    }

    @Test
Solution content 
        assertDeprecated(destDir);
        assertTagged(destDir);
        assertDocumentationOfRefinedMember(destDir);
        assertBug659ShowInheritedMembers(destDir);
        assertSequencedParameter(destDir);
    }

    @Test
File
CeylonDocToolTest.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
        assertDeprecated(destDir);
        assertTagged(destDir);
        assertDocumentationOfRefinedMember(destDir);
<<<<<<< HEAD
        assertBug659ShowInheritedMembers(destDir);
=======
        assertSequencedParameter(destDir);
>>>>>>> dcf25f5a8a64af47de42f76028a3c455f6678553
    }

    @Test
Solution content 
        assertDeprecated(destDir);
        assertTagged(destDir);
        assertDocumentationOfRefinedMember(destDir);
        assertBug659ShowInheritedMembers(destDir);
        assertSequencedParameter(destDir);
    }

    @Test
File
CeylonDocToolTest.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
                Pattern.compile("Deprecated in StubInterface.defaultDeprecatedMethodFromStubInterface"));
    }
    
<<<<<<< HEAD
	private void assertBug659ShowInheritedMembers(File destDir) throws IOException {
		assertMatchInFile(destDir, "class_StubClass.html",
				Pattern.compile("Show inherited methods"));
		assertMatchInFile(destDir, "class_StubClass.html",
				Pattern.compile("defaultDeprecatedMethodFromStubInterface"));
		assertMatchInFile(destDir, "class_StubClass.html",
				Pattern.compile("formalMethodFromStubInterface"));
=======
    private void assertSequencedParameter(File destDir) throws IOException {
        assertMatchInFile(destDir, "class_StubClass.html", 
                Pattern.compile("methodWithSequencedParameter\\(Integer... numbers\\)"));
>>>>>>> dcf25f5a8a64af47de42f76028a3c455f6678553
	}
    
    private File getOutputDir(CeylonDocTool tool, Module module) {
Solution content 
                Pattern.compile("Deprecated in StubInterface.defaultDeprecatedMethodFromStubInterface"));
    }
    
	private void assertBug659ShowInheritedMembers(File destDir) throws IOException {
		assertMatchInFile(destDir, "class_StubClass.html",
				Pattern.compile("Show inherited methods"));
		assertMatchInFile(destDir, "class_StubClass.html",
				Pattern.compile("defaultDeprecatedMethodFromStubInterface"));
		assertMatchInFile(destDir, "class_StubClass.html",
				Pattern.compile("formalMethodFromStubInterface"));
	}
	
    private void assertSequencedParameter(File destDir) throws IOException {
        assertMatchInFile(destDir, "class_StubClass.html", 
                Pattern.compile("methodWithSequencedParameter\\(Integer... numbers\\)"));
	}
    
    private File getOutputDir(CeylonDocTool tool, Module module) {
File
CeylonDocToolTest.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Method signature