svn commit: r1693054 - in /sling/trunk/contrib/extensions/bgservlets/engine/src: main/java/org/apache/sling/bgservlets/impl/storage/ test/java/org/apache/sling/bgservlets/impl/storage/

[bd...@apache.org]

Author: bdelacretaz
Date: Tue Jul 28 09:34:45 2015
New Revision: 1693054

URL: http://svn.apache.org/r1693054
Log:
SLING-4899 - add tests for job path

Added:
    sling/trunk/contrib/extensions/bgservlets/engine/src/test/java/org/apache/sling/bgservlets/impl/storage/
    sling/trunk/contrib/extensions/bgservlets/engine/src/test/java/org/apache/sling/bgservlets/impl/storage/JobStorageImplTest.java
Modified:
    sling/trunk/contrib/extensions/bgservlets/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageImpl.java

Modified: sling/trunk/contrib/extensions/bgservlets/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/bgservlets/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageImpl.java?rev=1693054&r1=1693053&r2=1693054&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/bgservlets/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageImpl.java (original)
+++ sling/trunk/contrib/extensions/bgservlets/engine/src/main/java/org/apache/sling/bgservlets/impl/storage/JobStorageImpl.java Tue Jul 28 09:34:45 2015
@@ -22,6 +22,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -56,7 +57,7 @@ public class JobStorageImpl implements J
     public static final String JOB_NODETYPE = "nt:unstructured";
     
     private String jobStoragePath;
-	private int counter;
+	private AtomicInteger counter = new AtomicInteger();
 	private static final DateFormat pathFormat = new SimpleDateFormat(PATH_FORMAT);
 	
     protected void activate(ComponentContext ctx) {
@@ -88,17 +89,22 @@ public class JobStorageImpl implements J
             throw new JobStorageException("Unable to create JobDataImpl", e);
         }
 	}
+	
+	String getNextPath() {
+	    final StringBuilder sb = new StringBuilder();
+	    sb.append(jobStoragePath);
+	    sb.append(pathFormat.format(new Date()));
+	    sb.append("/");
+	    sb.append(counter.incrementAndGet());
+	    return sb.toString();
+	}
 
 	Node createNewJobNode(Session s) throws RepositoryException {
-	    String path = null;
-	    synchronized (this) {
-	        counter++;
-	        path = jobStoragePath + pathFormat.format(new Date()) + "/" + counter;
-        }
+	    final String path = getNextPath();
 	    final Node result = new DeepNodeCreator().deepCreateNode(path, s, JOB_NODETYPE);
 	    result.addMixin(JobData.JOB_DATA_MIXIN);
 	    result.setProperty(BackgroundServletConstants.CREATION_TIME_PROPERTY, Calendar.getInstance());
-	    result.save();
+	    result.getSession().save();
 	    log.debug("Job node {} created", result.getPath());
 	    return result;
 	}

Added: sling/trunk/contrib/extensions/bgservlets/engine/src/test/java/org/apache/sling/bgservlets/impl/storage/JobStorageImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/bgservlets/engine/src/test/java/org/apache/sling/bgservlets/impl/storage/JobStorageImplTest.java?rev=1693054&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/bgservlets/engine/src/test/java/org/apache/sling/bgservlets/impl/storage/JobStorageImplTest.java (added)
+++ sling/trunk/contrib/extensions/bgservlets/engine/src/test/java/org/apache/sling/bgservlets/impl/storage/JobStorageImplTest.java Tue Jul 28 09:34:45 2015
@@ -0,0 +1,61 @@
+/*
+ * 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.bgservlets.impl.storage;
+
+import static org.junit.Assert.fail;
+
+import java.util.Hashtable;
+import java.util.regex.Pattern;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.service.component.ComponentContext;
+
+public class JobStorageImplTest {
+    private JobStorageImpl storage;
+    private final Mockery mockery = new Mockery(); 
+
+    @Before
+    public void setup() {
+        storage = new JobStorageImpl();
+        
+        final Hashtable<String, Object> props = new Hashtable<String, Object>();
+        props.put("job.storage.path", "/var/test");
+        
+        final ComponentContext ctx = mockery.mock(ComponentContext.class);
+        mockery.checking(new Expectations() {{
+            allowing(ctx).getProperties();
+            will(returnValue(props));
+        }});
+        
+        storage.activate(ctx);
+    }
+    
+    private void assertPath(String regex, String actual) {
+        if(!Pattern.compile(regex).matcher(actual).matches()) {
+            fail("Path " + actual + " does not match expected regex " + regex);
+        }
+    }
+    
+    @Test
+    public void testNextPath() {
+        assertPath("/var/test/2.*/1$", storage.getNextPath());
+        assertPath("/var/test/2.*/2$", storage.getNextPath());
+    }
+}
\ No newline at end of file