You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2018/07/08 16:06:25 UTC
[sling-org-apache-sling-testing-sling-mock] 02/02: ignore null
checks in unit tests
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/nullability
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit cc9b03c5a32d0611317484461f26d0f864b18dad
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Sun Jul 8 18:05:50 2018 +0200
ignore null checks in unit tests
---
.../apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java | 1 +
.../apache/sling/testing/mock/sling/builder/ContentBuilderTest.java | 1 +
.../testing/mock/sling/context/AbstractSlingContextImplTest.java | 1 +
.../sling/testing/mock/sling/context/NoResourceResolverTypeTest.java | 1 +
.../sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java | 1 +
.../org/apache/sling/testing/mock/sling/junit/SlingContextTest.java | 4 +++-
.../mock/sling/loader/AbstractContentLoaderAutoCommitTest.java | 1 +
.../testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java | 1 +
.../testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java | 1 +
.../testing/mock/sling/loader/AbstractContentLoaderJsonTest.java | 1 +
.../sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java | 1 +
.../testing/mock/sling/resource/AbstractJcrResourceResolverTest.java | 1 +
.../mock/sling/resource/AbstractMultipleResourceResolverTest.java | 2 ++
.../mock/sling/resource/AbstractSlingCrudResourceResolverTest.java | 1 +
.../sling/testing/mock/sling/resource/AbstractUniqueRootTest.java | 1 +
.../testing/mock/sling/services/MockSlingSettingServiceTest.java | 1 +
.../testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java | 1 +
17 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java b/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
index 462044d..d66f554 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
@@ -36,6 +36,7 @@ import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.BundleContext;
+@SuppressWarnings("null")
public class MockSlingScriptHelperTest {
private ResourceResolver resourceResolver;
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java b/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java
index 7e8ecb5..d92cdeb 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableMap;
+@SuppressWarnings("null")
public class ContentBuilderTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java b/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java
index 4c2d13b..79af168 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java
@@ -41,6 +41,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+@SuppressWarnings("null")
public abstract class AbstractSlingContextImplTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java b/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
index 5af4d3e..5906a0b 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
@@ -32,6 +32,7 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
+@SuppressWarnings("null")
public class NoResourceResolverTypeTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java b/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java
index 0cbecfa..838179c 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java
@@ -36,6 +36,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableMap;
+@SuppressWarnings("null")
public class FindResourcesTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java b/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java
index 8caef09..8e45452 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextTest.java
@@ -29,6 +29,7 @@ import org.apache.sling.api.adapter.SlingAdaptable;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -39,6 +40,7 @@ import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
@RunWith(MockitoJUnitRunner.class)
+@SuppressWarnings("null")
public class SlingContextTest {
private final SlingContextCallback contextBeforeSetup = mock(SlingContextCallback.class);
@@ -161,7 +163,7 @@ public class SlingContextTest {
AdapterFactory adapterFactory = new AdapterFactory() {
@SuppressWarnings("unchecked")
@Override
- public <AdapterType> AdapterType getAdapter(Object adaptable, Class<AdapterType> type) {
+ public <AdapterType> AdapterType getAdapter(@NotNull Object adaptable, @NotNull Class<AdapterType> type) {
return (AdapterType)(((TestAdaptable)adaptable).getMessage() + "-initial");
}
};
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
index b0df5fd..cb14cc6 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
@@ -30,6 +30,7 @@ import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Rule;
import org.junit.Test;
+@SuppressWarnings("null")
public abstract class AbstractContentLoaderAutoCommitTest {
private static String DEST_RES_NAME = "dest";
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
index 81a2aa8..3e624b2 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
@@ -39,6 +39,7 @@ import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
+@SuppressWarnings("null")
public abstract class AbstractContentLoaderBinaryTest {
private static final int SAMPLE_IMAGE_FILESIZE = 62;
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
index a4ccb6a..ceafc03 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
@@ -44,6 +44,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
+@SuppressWarnings("null")
public abstract class AbstractContentLoaderJsonDamTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
index bf5aa95..40f3319 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
@@ -44,6 +44,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
+@SuppressWarnings("null")
public abstract class AbstractContentLoaderJsonTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
index 3fedcca..75e4f31 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrNamespaceTest.java
@@ -38,6 +38,7 @@ import org.osgi.framework.BundleContext;
/**
* Validates correct registering and mapping of JCR namespaces, esp. the sling namespace.
*/
+@SuppressWarnings("null")
public abstract class AbstractJcrNamespaceTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java
index 8b6251a..8590e46 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractJcrResourceResolverTest.java
@@ -56,6 +56,7 @@ import com.google.common.collect.ImmutableMap;
* Implements simple write and read resource and values test.
* JCR API is used to create the test data.
*/
+@SuppressWarnings("null")
public abstract class AbstractJcrResourceResolverTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java
index cb4e6e2..cf6b167 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java
@@ -36,6 +36,7 @@ import com.google.common.collect.ImmutableMap;
/**
* Tests content access accross multiple resource resolvers.
*/
+@SuppressWarnings("null")
public abstract class AbstractMultipleResourceResolverTest {
private final BundleContext bundleContext = MockOsgi.newBundleContext();
@@ -51,6 +52,7 @@ public abstract class AbstractMultipleResourceResolverTest {
MockOsgi.shutdown(bundleContext);
}
+ @SuppressWarnings("deprecation")
@Test
public void testMultipleResourceResolver() throws Exception {
ResourceResolverFactory factory = newResourceResolerFactory();
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
index 7b0d5e7..a075908 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
@@ -56,6 +56,7 @@ import com.google.common.collect.Lists;
* Implements simple write and read resource and values test. Sling CRUD API is
* used to create the test data.
*/
+@SuppressWarnings("null")
public abstract class AbstractSlingCrudResourceResolverTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java
index 0ddd658..fe2f8c2 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java
@@ -26,6 +26,7 @@ import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Rule;
import org.junit.Test;
+@SuppressWarnings("null")
public abstract class AbstractUniqueRootTest {
@Rule
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java b/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java
index 4a96b95..1fcdcda 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java
@@ -29,6 +29,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableSet;
+@SuppressWarnings("null")
public class MockSlingSettingServiceTest {
@Test
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java b/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
index 0f12ed6..c5c14c2 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
@@ -46,6 +46,7 @@ import org.mockito.runners.MockitoJUnitRunner;
import org.osgi.framework.BundleContext;
@RunWith(MockitoJUnitRunner.class)
+@SuppressWarnings("null")
public class MockSlingHttpServletRequestTest {
@Mock