backfill some basic tests

Author: jwmach1

src/main/java/org/jenkinsci/plugins/parameterizedschedular/FieldAccessor.java

@@ -2,17 +2,24 @@
 
 import java.lang.reflect.Field;
 
+/**
+ * lets work around some final classes I couldn't subclass, but don't want to duplicate everything
+ * 
+ * @author jameswilson
+ *
+ */
 public class FieldAccessor {
 
-	public static Object access(Object instance, String fieldName) {
+	@SuppressWarnings("unchecked")
+	public <T> T access(Object instance, String fieldName) {
 
 		try {
 			Field field = instance.getClass().getDeclaredField(fieldName);
 			boolean isAccessible = field.isAccessible();
 			field.setAccessible(true);
 			Object value = field.get(instance);
 			field.setAccessible(isAccessible);
-			return value;
+			return (T)value;
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/org/jenkinsci/plugins/parameterizedschedular/ParameterizedCronTab.java

@@ -7,15 +7,13 @@
 import hudson.scheduler.CronTab;
 import hudson.scheduler.Hash;
 
-import java.lang.reflect.Method;
 import java.util.Calendar;
-import java.util.HashMap;
 import java.util.Map;
 
-import com.google.common.collect.Maps;
-
 import antlr.ANTLRException;
 
+import com.google.common.collect.Maps;
+
 /**
  * this is a copy of {@link CronTab} with added parameters map support
  * 
@@ -24,15 +22,22 @@
 public class ParameterizedCronTab {
 
 	private final Map<String, String> parameterValues;
-//	private final CronTab cronTab;
-	private long[] bits;
-	private Integer dayOfWeek;
+	private final long[] bits;
+	private final Integer dayOfWeek;
+	private final CronTab cronTab;
 
+	/**
+	 * look at this fragile happy-crappy! Is this better than duplicating all of the Crontab source-tree? you decide.
+	 * 
+	 * @param cronTab the crontab to use as a template
+	 * @param parameters the parameters in name=value key pairings
+	 */
 	public ParameterizedCronTab(CronTab cronTab, Map<String, String> parameters) {
-//		this.cronTab = cronTab;
-		bits = (long[])FieldAccessor.access(cronTab, "bits");
-		dayOfWeek = (Integer)FieldAccessor.access(cronTab, "dayOfWeek");
-		
+		this.cronTab = cronTab;
+		FieldAccessor fieldAccessor = new FieldAccessor();
+		bits = fieldAccessor.access(cronTab, "bits");
+		dayOfWeek = fieldAccessor.access(cronTab, "dayOfWeek");
+
 		parameterValues = parameters;
 	}
 
@@ -55,54 +60,29 @@ public Map<String, String> getParameterValues() {
 		return parameterValues;
 	}
 
-    /**
-     * Returns true if n-th bit is on.
-     */
-    private boolean checkBits(long bitMask, int n) {
-        return (bitMask|(1L<<n))==bitMask;
-    }
+	/**
+	 * Returns true if n-th bit is on.
+	 */
+	private boolean checkBits(long bitMask, int n) {
+		return (bitMask | (1L << n)) == bitMask;
+	}
 
 	public boolean check(Calendar calendar) {
-        if(!checkBits(bits[0],calendar.get(MINUTE)))
-            return false;
-        if(!checkBits(bits[1],calendar.get(HOUR_OF_DAY)))
-            return false;
-        if(!checkBits(bits[2],calendar.get(DAY_OF_MONTH)))
-            return false;
-        if(!checkBits(bits[3],calendar.get(MONTH)+1))
-            return false;
-        if(!checkBits(dayOfWeek,calendar.get(Calendar.DAY_OF_WEEK)-1))
-            return false;
-
-        return true;
+		if (!checkBits(bits[0], calendar.get(MINUTE)))
+			return false;
+		if (!checkBits(bits[1], calendar.get(HOUR_OF_DAY)))
+			return false;
+		if (!checkBits(bits[2], calendar.get(DAY_OF_MONTH)))
+			return false;
+		if (!checkBits(bits[3], calendar.get(MONTH) + 1))
+			return false;
+		if (!checkBits(dayOfWeek, calendar.get(Calendar.DAY_OF_WEEK) - 1))
+			return false;
 
-//		Object result;
-//		try {
-//			Method method = CronTab.class.getMethod("check", Calendar.class);
-//			result = method.invoke(cronTab, calendar);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//			return false;
-//		}
-//		return (Boolean) result;
-		//		return cronTab.check(calendar);
+		return true;
 	}
 
 	public String checkSanity() {
-//        for( int i=0; i<5; i++ ) {
-//            long bitMask = (i<4)?bits[i]:(long)dayOfWeek;
-//            for( int j=BaseParser.LOWER_BOUNDS[i]; j<=BaseParser.UPPER_BOUNDS[i]; j++ ) {
-//                if(!checkBits(bitMask,j)) {
-//                    // this rank has a sparse entry.
-//                    // if we have a sparse rank, one of them better be the left-most.
-//                    if(i>0)
-//                        return Messages.CronTab_do_you_really_mean_every_minute_when_you(spec, "0 " + spec.substring(spec.indexOf(' ')+1));
-//                    // once we find a sparse rank, upper ranks don't matter
-//                    return null;
-//                }
-//            }
-//        }
-
-        return null;
+		return cronTab.checkSanity();
 	}
 }

src/test/java/org/jenkinsci/plugins/parameterizedschedular/ParameterizedCronTabTest.java

@@ -0,0 +1,29 @@
+package org.jenkinsci.plugins.parameterizedschedular;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import hudson.scheduler.CronTab;
+
+import java.util.GregorianCalendar;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.google.common.collect.Maps;
+
+public class ParameterizedCronTabTest {
+
+	@Test
+	public void ctor_happyPath() throws Exception {
+		Map<String, String> parameters = Maps.newHashMap();
+		parameters.put("one", "onevalue");
+		CronTab testCronTab = new CronTab("* * * * *");
+		ParameterizedCronTab testObject = new ParameterizedCronTab(testCronTab, parameters);
+
+		assertEquals(parameters, testObject.getParameterValues());
+		assertTrue(testObject.check(new GregorianCalendar()));
+		assertNull(testObject.checkSanity());
+	}
+
+}

src/test/java/org/jenkinsci/plugins/parameterizedschedular/ParameterizedStaplerRequestTest.java

@@ -0,0 +1,24 @@
+package org.jenkinsci.plugins.parameterizedschedular;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertSame;
+
+import org.junit.Test;
+
+public class ParameterizedStaplerRequestTest {
+
+	@Test
+	public void getParameter() {
+		String testValue = "testvalue";
+		ParameterizedStaplerRequest testObject = new ParameterizedStaplerRequest(testValue);
+		assertSame(testValue, testObject.getParameter(null));
+	}
+
+	@Test
+	public void getParameterValues() {
+		String testValue = "testvalue";
+		ParameterizedStaplerRequest testObject = new ParameterizedStaplerRequest(testValue);
+		assertArrayEquals(new String[] { testValue }, testObject.getParameterValues(null));
+	}
+
+}