rest method to validate cron expression: add unit test

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1235829 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
index bab18fa61f48b1be2d2d7901a9813a97a7b1a63a..ba010aaf1fcbef6ede079d52e9aa2e181588098b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
@@ -180,7 +180,7 @@ public class DefaultCommonServices
         return new ArchivaRuntimeInfo();
     }
 
-    public Boolean validateCronExpression( @QueryParam( "cronExpression" ) String cronExpression )
+    public Boolean validateCronExpression( String cronExpression )
         throws ArchivaRestServiceException
     {
         return cronExpressionValidator.validate( cronExpression );

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
index df0e3bbb07d3ebe3e8cc320232ed2094fc8461de..e648b7ccabfb4c47c464ac8221d313638a7d95e1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
@@ -22,6 +22,7 @@ package org.apache.archiva.rest.services;
 import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.common.utils.FileUtil;
 import org.apache.archiva.rest.api.services.ArchivaAdministrationService;
+import org.apache.archiva.rest.api.services.CommonServices;
 import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
 import org.apache.archiva.rest.api.services.NetworkProxyService;
 import org.apache.archiva.rest.api.services.PingService;
@@ -198,6 +199,20 @@ public abstract class AbstractArchivaRestTest
 
     }
 
+    protected CommonServices getCommonServices( String authzHeader )
+    {
+        CommonServices service =
+            JAXRSClientFactory.create( getBaseUrl() + "/" + getRestServicesPath() + "/archivaServices/",
+                                       CommonServices.class );
+
+        if ( authzHeader != null )
+        {
+            WebClient.client( service ).header( "Authorization", authzHeader );
+        }
+        WebClient.getConfig( service ).getHttpConduit().getClient().setReceiveTimeout( 100000000 );
+        return service;
+    }
+
     protected ManagedRepository getTestManagedRepository()
     {
         String location = new File( FileUtil.getBasedir(), "target/test-repo" ).getAbsolutePath();

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CommonServicesTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CommonServicesTest.java
new file mode 100644 (file)
index 0000000..eac5aa9
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CommonServicesTest.java
@@ -0,0 +1,45 @@
+package org.apache.archiva.rest.services;
+/*
+ * 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.
+ */
+
+import org.apache.archiva.rest.api.services.CommonServices;
+import org.junit.Test;
+
+/**
+ * @author Olivier Lamy
+ */
+public class CommonServicesTest
+    extends AbstractArchivaRestTest
+{
+    @Test
+    public void validCronExpression()
+        throws Exception
+    {
+        CommonServices commonServices = getCommonServices( null );
+        assertTrue( commonServices.validateCronExpression( "0 0,30 * * * ?" ) );
+    }
+
+    @Test
+    public void nonValidCronExpression()
+        throws Exception
+    {
+        CommonServices commonServices = getCommonServices( null );
+        assertFalse( commonServices.validateCronExpression( "0,30 * * * ?" ) );
+    }
+}