Skip to content

Commit

Permalink
Merge pull request mockito#931 from tmurakami/fix_issue_929
Browse files Browse the repository at this point in the history
Fixes mockito#929: Move the resources directory to src/main
  • Loading branch information
raphw authored Feb 7, 2017
2 parents 6f41c99 + 3d11f6c commit 9b42765
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 0 deletions.
1 change: 1 addition & 0 deletions subprojects/inline/inline.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ apply from: "$rootDir/gradle/java-library.gradle"

dependencies {
compile project.rootProject
testCompile 'junit:junit:4.12'
}

apply from: "$rootDir/gradle/publishable-java-library.gradle"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package org.mockitoinline;

import org.junit.Test;
import org.mockito.Mockito;

public class FinalClassMockingTest {

@Test
public void no_exception_while_mocking_final_class() throws Exception {
Mockito.mock(FinalClass.class);
}

private static final class FinalClass {

}

}
16 changes: 16 additions & 0 deletions subprojects/inline/src/test/java/org/mockitoinline/PluginTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.mockitoinline;

import org.junit.Test;
import org.mockito.internal.configuration.plugins.Plugins;
import org.mockito.internal.creation.bytebuddy.InlineByteBuddyMockMaker;

import static org.junit.Assert.*;

public class PluginTest {

@Test
public void plugin_type_should_be_inline() throws Exception {
assertTrue(Plugins.getMockMaker() instanceof InlineByteBuddyMockMaker);
}

}

0 comments on commit 9b42765

Please sign in to comment.