diff --git a/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java b/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java index 1691ddc10f..449cf68e3c 100644 --- a/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java +++ b/src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java @@ -81,7 +81,7 @@ public StackTraceElement filterFirst(Throwable target, boolean isInline) { // The assumption here is that the CLEANER filter will not filter out every single // element. However, since we don't want to compute the full length of the stacktrace, // we don't know the upper boundary. Therefore, simply increment the counter and go as - // far as we have to go, assuming that we get there. If, in the rare occassion, we + // far as we have to go, assuming that we get there. If, in the rare occasion, we // don't, we fall back to the old slow path. while (true) { try { diff --git a/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java b/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java index 80cbf65be3..5f20d01544 100644 --- a/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java +++ b/src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java @@ -524,7 +524,7 @@ public Class rawType() { try { return Class.forName(stringBuilder.append("L").append(rawComponentType.getName()).append(";").toString(), false, rawComponentType.getClassLoader()); } catch (ClassNotFoundException e) { - throw new IllegalStateException("This was not supposed to happend", e); + throw new IllegalStateException("This was not supposed to happen.", e); } } } diff --git a/src/main/java/org/mockito/internal/util/reflection/InstanceField.java b/src/main/java/org/mockito/internal/util/reflection/InstanceField.java index 8756e6a38c..d46b44ff3a 100644 --- a/src/main/java/org/mockito/internal/util/reflection/InstanceField.java +++ b/src/main/java/org/mockito/internal/util/reflection/InstanceField.java @@ -14,7 +14,7 @@ /** * Represents an accessible instance field. * - * Contains the instance reference on which the field can be read adn write. + * Contains the instance reference on which the field can be read and write. */ public class InstanceField { private final Field field; diff --git a/src/test/java/org/mockito/internal/util/StringUtilTest.java b/src/test/java/org/mockito/internal/util/StringUtilTest.java index 1858fe0421..b4885f4b45 100644 --- a/src/test/java/org/mockito/internal/util/StringUtilTest.java +++ b/src/test/java/org/mockito/internal/util/StringUtilTest.java @@ -40,7 +40,7 @@ public void joins_two_lines() throws Exception { } @Test - public void join_has_preceeding_linebreak() throws Exception { + public void join_has_preceding_linebreak() throws Exception { assertThat(StringUtil.join("line1")).isEqualTo("\nline1"); } diff --git a/src/test/java/org/mockitousage/matchers/InvalidUseOfMatchersTest.java b/src/test/java/org/mockitousage/matchers/InvalidUseOfMatchersTest.java index a562f1fab5..ae43c1db9a 100644 --- a/src/test/java/org/mockitousage/matchers/InvalidUseOfMatchersTest.java +++ b/src/test/java/org/mockitousage/matchers/InvalidUseOfMatchersTest.java @@ -75,7 +75,7 @@ public void should_scream_when_no_matchers_inside_not() { } @Test - public void should_scream_when_not_enough_matchers_inside_or_AddtionalMatcher() { + public void should_scream_when_not_enough_matchers_inside_or_AdditionalMatcher() { try { mock.simpleMethod(AdditionalMatchers.or(eq("jkl"), "asd")); fail(); diff --git a/src/test/java/org/mockitousage/stubbing/StubbingWithThrowablesTest.java b/src/test/java/org/mockitousage/stubbing/StubbingWithThrowablesTest.java index 7c776b364f..c92fa45e3c 100644 --- a/src/test/java/org/mockitousage/stubbing/StubbingWithThrowablesTest.java +++ b/src/test/java/org/mockitousage/stubbing/StubbingWithThrowablesTest.java @@ -263,7 +263,7 @@ public void shouldNotAllowSettingNullVarArgsThrowableClasses() throws Exception } @Test - public void shouldNotAllowDifferntCheckedException() throws Exception { + public void shouldNotAllowDifferentCheckedException() throws Exception { IMethods mock = mock(IMethods.class); exception.expect(MockitoException.class); diff --git a/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidTempFileLocator.java b/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidTempFileLocator.java index 34e179b40f..4d193ba8c4 100644 --- a/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidTempFileLocator.java +++ b/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidTempFileLocator.java @@ -71,10 +71,10 @@ private static File[] guessPath(String input) { } String packageName = potential.substring(start, end); File dataDir = new File("/data/data/" + packageName); - if (isWriteableDirectory(dataDir)) { + if (isWritableDirectory(dataDir)) { File cacheDir = new File(dataDir, "cache"); if (fileOrDirExists(cacheDir) || cacheDir.mkdir()) { - if (isWriteableDirectory(cacheDir)) { + if (isWritableDirectory(cacheDir)) { results.add(cacheDir); } } @@ -99,7 +99,7 @@ private static boolean fileOrDirExists(File file) { return file.exists(); } - private static boolean isWriteableDirectory(File file) { + private static boolean isWritableDirectory(File file) { return file.isDirectory() && file.canWrite(); } }