svn commit: r1787569 - in /sling/trunk/bundles/extensions/validation/core/src: main/java/org/apache/sling/validation/impl/ test/java/org/apache/sling/validation/impl/

[ol...@apache.org]

Author: olli
Date: Sat Mar 18 15:36:44 2017
New Revision: 1787569

URL: http://svn.apache.org/viewvc?rev=1787569&view=rev
Log:
SLING-6663 ResourceToValidationResultAdapterFactory fails adapting to ValidationResult

Added:
    sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactoryTest.java
Modified:
    sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactory.java

Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactory.java?rev=1787569&r1=1787568&r2=1787569&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactory.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactory.java Sat Mar 18 15:36:44 2017
@@ -40,7 +40,7 @@ public class ResourceToValidationResultA
         AdapterType adapter = null;
         if (adaptable instanceof Resource) {
             final Resource resource = (Resource) adaptable;
-            if (type == ValidationFailure.class) {
+            if (type == ValidationResult.class) {
                 return (AdapterType)getValidationResultFromCache(resource);
             } else {
                 LOG.warn("Cannot handle adapter {}", type.getName());
@@ -55,7 +55,7 @@ public class ResourceToValidationResultA
         resource.getResourceMetadata().put(KEY_RESOURCE_METADATA, validationResult);
     }
     
-    private ValidationFailure getValidationResultFromCache(Resource resource) {
-        return (ValidationFailure) resource.getResourceMetadata().get(KEY_RESOURCE_METADATA);
+    private ValidationResult getValidationResultFromCache(Resource resource) {
+        return (ValidationResult) resource.getResourceMetadata().get(KEY_RESOURCE_METADATA);
     }
 }

Added: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactoryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactoryTest.java?rev=1787569&view=auto
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactoryTest.java (added)
+++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ResourceToValidationResultAdapterFactoryTest.java Sat Mar 18 15:36:44 2017
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.validation.impl;
+
+import java.util.Collections;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceMetadata;
+import org.apache.sling.validation.ValidationResult;
+import org.junit.Test;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class ResourceToValidationResultAdapterFactoryTest {
+
+    @Test
+    public void testResourceToValidationResultAdaption() {
+        final ValidationResult result = mock(ValidationResult.class);
+        when(result.isValid()).thenReturn(true);
+        when(result.getFailures()).thenReturn(Collections.emptyList());
+        final Resource resource = mock(Resource.class);
+        final ResourceMetadata metadata = mock(ResourceMetadata.class);
+        when(metadata.get("sling.validationResult")).thenReturn(result);
+        when(resource.getResourceMetadata()).thenReturn(metadata);
+        final ResourceToValidationResultAdapterFactory factory = new ResourceToValidationResultAdapterFactory();
+        final ValidationResult adapter = factory.getAdapter(resource, ValidationResult.class);
+        assertThat(adapter, is(result));
+    }
+
+}