Merge pull request #26 from BorderTech/latest-qa

Latest QA

Author: jonathanaustin

.circleci/config.yml

@@ -0,0 +1,16 @@
+before_install:
+- echo "MAVEN_OPTS='-Xmx512m -XX:MaxPermSize=128m'" > ~/.mavenrc
+- mvn clean
+- wget https://github.com/codacy/codacy-coverage-reporter/releases/download/4.0.5/codacy-coverage-reporter-4.0.5-assembly.jar
+
+language: Java
+jdk:
+ - oraclejdk8
+
+## Travis installs the project with the following maven command:- "mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V"
+script:
+ - mvn package
+
+## Send Coverage to Codacy
+after_success:
+  - java -jar codacy-coverage-reporter-4.0.5-assembly.jar report -l Java -r taskmaster-core/target/site/jacoco/jacoco.xml

.travis.yml

@@ -2,8 +2,10 @@
 Task Master helps run ASYNC tasks.
 
 ## Status
-[![CircleCI](https://circleci.com/gh/BorderTech/java-taskmaster.svg?style=svg)](https://circleci.com/gh/BorderTech/java-taskmaster)
+[![Build Status](https://travis-ci.com/BorderTech/java-taskmaster.svg?branch=master)](https://travis-ci.com/BorderTech/java-taskmaster)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/83bcfdba5e34433894e8b958bdb958a5)](https://www.codacy.com/app/BorderTech/java-taskmaster?utm_source=github.com&utm_medium=referral&utm_content=BorderTech/java-taskmaster&utm_campaign=Badge_Grade)
+[![Javadocs](https://www.javadoc.io/badge/com.github.bordertech.taskmaster/taskmaster.svg)](https://www.javadoc.io/doc/com.github.bordertech.taskmaster/taskmaster)
+[![Maven Central](https://img.shields.io/maven-central/v/com.github.bordertech.taskmaster/taskmaster.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.github.bordertech.taskmaster%22%20AND%20a:%22taskmaster%22)
 
 ## What is TaskMaster
 

README.md

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.github.bordertech.common</groupId>
 		<artifactId>qa-parent</artifactId>
-		<version>1.0.4</version>
+		<version>1.0.10</version>
 	</parent>
 
 	<packaging>pom</packaging>
@@ -38,8 +38,8 @@
 	</issueManagement>
 
 	<ciManagement>
-		<system>CircleCI</system>
-		<url>https://circleci.com/gh/bordertech/java-taskmaster/</url>
+		<system>Travis CI</system>
+		<url>https://travis-ci.com/BorderTech/java-taskmaster</url>
 	</ciManagement>
 
 	<dependencyManagement>
@@ -105,7 +105,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>3.8</version>
+				<version>3.8.1</version>
 			</dependency>
 
 		</dependencies>

pom.xml

@@ -16,10 +16,6 @@
 
 	<packaging>jar</packaging>
 
-	<properties>
-		<bt.qa.skip>false</bt.qa.skip>
-	</properties>
-
 	<description>
 		Task Master provides a ehcache helper.
 	</description>

taskmaster-cache-ehcache/pom.xml

@@ -16,10 +16,6 @@
 
 	<packaging>jar</packaging>
 
-	<properties>
-		<bt.qa.skip>false</bt.qa.skip>
-	</properties>
-
 	<description>
 		Task Master provides a Cache Helper API.
 	</description>

taskmaster-cache-helper/pom.xml

@@ -16,10 +16,6 @@
 
 	<packaging>jar</packaging>
 
-	<properties>
-		<bt.qa.skip>false</bt.qa.skip>
-	</properties>
-
 	<description>
 		Task Master allows a Runnable task to be submitted for execution and returns a Future representing that task.
 	</description>
@@ -53,6 +49,12 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- Junit -->
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+		</dependency>
+
 	</dependencies>
 
 </project>

taskmaster-core/pom.xml

@@ -43,7 +43,7 @@ public boolean isDone() {
 	@Override
 	public T get() throws InterruptedException, ExecutionException {
 		if (result instanceof TaskMasterException) {
-			Exception excp = (TaskMasterException) result;
+			TaskMasterException excp = (TaskMasterException) result;
 			throw new ExecutionException("Error processing future. " + excp.getMessage(), excp);
 		}
 		return result;

taskmaster-core/src/main/java/com/github/bordertech/taskmaster/impl/TaskFutureResult.java

@@ -4,6 +4,7 @@
 import java.io.Serializable;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -24,12 +25,19 @@ public class LogicalThreadPool implements Serializable {
 	private final Semaphore semaphore;
 	private boolean shutdown;
 
+	/**
+	 * Default constructor with default name and no limit to threads.
+	 */
+	public LogicalThreadPool() {
+		this(null, 0);
+	}
+
 	/**
 	 * @param name thread pool name
 	 * @param max the maximum threads. Zero means no limit.
 	 */
 	public LogicalThreadPool(final String name, final int max) {
-		this.name = name == null ? "default" : name;
+		this.name = StringUtils.isEmpty(name) ? "default" : name;
 		this.max = max > 0 ? max : 0;
 		this.semaphore = new Semaphore(this.max, true);
 	}

taskmaster-core/src/main/java/com/github/bordertech/taskmaster/logical/LogicalThreadPool.java

@@ -0,0 +1,70 @@
+package com.github.bordertech.taskmaster.logical;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link LogicalThreadPool}.
+ */
+public class LogicalThreadPoolTest {
+
+	@Test
+	public void testConstructor1() {
+		LogicalThreadPool pool = new LogicalThreadPool();
+		Assert.assertEquals("Incorrect pool name for default constructor", "default", pool.getName());
+		Assert.assertEquals("Incorrect max threads for default constructor", 0, pool.getMax());
+	}
+
+	@Test
+	public void testConstructor2() {
+		LogicalThreadPool pool = new LogicalThreadPool("foo", 5);
+		Assert.assertEquals("Incorrect name for constructor", "foo", pool.getName());
+		Assert.assertEquals("Incorrect default max threads for constructor", 5, pool.getMax());
+	}
+
+	@Test
+	public void testDefaultShutdown() {
+		Assert.assertFalse("Pool should not be shutdown.", new LogicalThreadPool().isShutdown());
+	}
+
+	@Test
+	public void testNameDefault() {
+		Assert.assertEquals("Pool name should be default for default constructor", "default", new LogicalThreadPool().getName());
+	}
+
+	@Test
+	public void testNameNull() {
+		Assert.assertEquals("Pool name should be default for null in constructor", "default", new LogicalThreadPool(null, 0).getName());
+	}
+
+	@Test
+	public void testNameEmpty() {
+		Assert.assertEquals("Pool name should be default for empty in constructor", "default", new LogicalThreadPool("", 0).getName());
+	}
+
+	@Test
+	public void testNameValue() {
+		Assert.assertEquals("Pool name should be default for value in constructor", "foo", new LogicalThreadPool("foo", 0).getName());
+	}
+
+	@Test
+	public void testMaxDefault() {
+		Assert.assertEquals("Pool max should default to zero (no limit).", 0, new LogicalThreadPool().getMax());
+	}
+
+	@Test
+	public void testMaxNegative() {
+		Assert.assertEquals("Pool max should be zero for negative constructor value.", 0, new LogicalThreadPool(null, -1).getMax());
+	}
+
+	@Test
+	public void testMaxZero() {
+		Assert.assertEquals("Pool max should be zero for zero constructor value.", 0, new LogicalThreadPool(null, 0).getMax());
+	}
+
+	@Test
+	public void testMaxPositive() {
+		Assert.assertEquals("Pool max should be positive value.", 10, new LogicalThreadPool(null, 10).getMax());
+	}
+
+}