Merge branch 'master' of https://github.com/DMDirc/Util

build.gradle

@@ -1,13 +1,11 @@
-import org.mdonoughe.JGitDescribeTask
-
-def jgit = new org.mdonoughe.JGitDescribeTask()
-jgit.setDir(new File("$projectDir", '.git'))
-project.version = jgit.getDescription() + '-SNAPSHOT'
+group = 'com.dmdirc'
 
+apply plugin: 'com.dmdirc.git-version'
 apply plugin: 'java'
 apply plugin: 'maven-publish'
+apply plugin: 'jacoco'
+apply plugin: 'com.github.kt3k.coveralls'
 
-group = 'com.dmdirc'
 
 sourceSets {
     main {
@@ -33,6 +31,11 @@ dependencies {
     testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.0'
 }
 
+// DMDirc uses 18.0, JimFS has a transient dep on 16.0.1 - force the newer version
+configurations.all {
+    resolutionStrategy.force('com.google.guava:guava:18.0')
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
@@ -51,34 +54,26 @@ task wrapper(type: Wrapper) {
     gradleVersion = '2.2.1'
 }
 
-task getCredentials << {
-    def target = file('nexus-teamcity.gradle')
-    if (!target.exists()) {
-        new URL('http://www.dmdirc.com/private/nexus-teamcity.gradle').withInputStream{
-            i -> target.withOutputStream { it << i }
-        }
-    }
-
-    apply from: 'nexus-teamcity.gradle'
-    project.publishing.repositories[0].credentials {
-        username "$nexusUser"
-        password "$nexusPass"
-    }
-}
-
-task publishSnapshot(dependsOn: ['getCredentials', 'publishMavenJavaPublicationToSnapshotsRepository']) << {
+task publishSnapshot(dependsOn: 'publishMavenJavaPublicationToSnapshotsRepository') << {
 }
 
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-            url 'http://artifactory.dmdirc.com/artifactory/repo'
-        }
+        maven { url 'http://artifactory.dmdirc.com/artifactory/repo' }
+        maven { url 'https://dl.bintray.com/dmdirc/releases/' }
     }
 
     dependencies {
-        classpath group: 'com.github.shanemcc', name: 'jgit-describe', version: '0.5'
-        classpath group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '2.3.1.+'
+        classpath group: 'com.dmdirc', name: 'git-version', version: '1.0'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.1.0'
     }
 }
+
+jacocoTestReport {
+    reports {
+        xml.enabled = true // coveralls plugin depends on xml format report
+        html.enabled = true
+    }
+}
+

circle.yml

@@ -2,4 +2,20 @@
 
 machine:
   java:
-    version: oraclejdk8
+    version: oraclejdk8
+  environment:
+    TERM: dumb
+
+checkout:
+  post:
+    - git fetch --tags
+
+dependencies:
+  override:
+    - ./gradlew dependencies
+
+test:
+  override:
+    - ./gradlew test
+  post:
+    - ./gradlew jacocoTestReport coveralls

src/com/dmdirc/util/colours/ColourUtils.java

@@ -25,7 +25,7 @@ package com.dmdirc.util.colours;
 /**
  * Some util methods for dealing with colours.
  */
-public class ColourUtils {
+public final class ColourUtils {
 
     private ColourUtils() {
         //Do not instantiate.

test/com/dmdirc/util/collections/ObservableListDecoratorTest.java

@@ -23,12 +23,20 @@
 package com.dmdirc.util.collections;
 
 import java.util.Arrays;
-import java.util.List;
-import org.junit.Test;
 import java.util.LinkedList;
+import java.util.List;
 
 import org.junit.Before;
-import static org.mockito.Mockito.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 public class ObservableListDecoratorTest {
 
@@ -101,4 +109,38 @@ public class ObservableListDecoratorTest {
         verify(observer).onItemsRemoved(obslist, 2, 2);
     }
 
+    @Test
+    public void testRemovingListenerStopsFutureCalls() {
+        obslist.removeListListener(observer);
+        obslist.add("test");
+        verify(observer, never()).onItemsAdded(obslist, 0, 0);
+    }
+
+    @Test
+    public void testSize() {
+        assertEquals(0, obslist.size());
+        obslist.add("test");
+        assertEquals(1, obslist.size());
+        obslist.add("test");
+        assertEquals(2, obslist.size());
+    }
+
+    @Test
+    public void testIsEmpty() {
+        assertTrue(obslist.isEmpty());
+        obslist.add("test");
+        assertFalse(obslist.isEmpty());
+        obslist.remove("test");
+        assertTrue(obslist.isEmpty());
+    }
+
+    @Test
+    public void testContains() {
+        assertFalse(obslist.contains("test"));
+        obslist.add("test");
+        assertTrue(obslist.contains("test"));
+        obslist.remove("test");
+        assertFalse(obslist.contains("test"));
+    }
+
 }

test/com/dmdirc/util/collections/QueuedLinkedHashSetTest.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.util.collections;
+
+import java.util.NoSuchElementException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class QueuedLinkedHashSetTest {
+
+    private QueuedLinkedHashSet<String> set;
+
+    @Before
+    public void setup() {
+        set = new QueuedLinkedHashSet<>();
+    }
+
+    @Test(expected = NoSuchElementException.class)
+    public void testElementWhenNewlyCreated() {
+        set.element();
+    }
+
+    @Test(expected = NoSuchElementException.class)
+    public void testElementWhenEmpty() {
+        set.offer("foo");
+        set.remove();
+        set.element();
+    }
+
+    @Test(expected = NoSuchElementException.class)
+    public void testRemoveWhenNewlyCreated() {
+        set.remove();
+    }
+
+    @Test(expected = NoSuchElementException.class)
+    public void testRemoveWhenEmpty() {
+        set.offer("foo");
+        set.remove();
+        set.remove();
+    }
+
+    @Test
+    public void testOfferMultipleItems() {
+        assertTrue(set.offer("one"));
+        assertEquals(1, set.size());
+        assertFalse(set.offer("one"));
+        assertEquals(1, set.size());
+    }
+
+    @Test
+    public void testRemove() {
+        set.offer("one");
+        set.offer("two");
+        assertEquals("two", set.remove());
+        assertEquals("one", set.remove());
+        assertTrue(set.isEmpty());
+    }
+
+    @Test
+    public void testPoll() {
+        set.offer("one");
+        set.offer("two");
+        assertEquals("two", set.poll());
+        assertEquals("one", set.poll());
+        assertTrue(set.isEmpty());
+    }
+
+    @Test
+    public void testPeekWhenNewlyCreated() {
+        assertNull(set.peek());
+    }
+
+    @Test
+    public void testPeekWhenEmpty() {
+        set.offer("foo");
+        set.remove();
+        assertNull(set.peek());
+    }
+
+    @Test
+    public void testPeek() {
+        set.offer("one");
+        set.offer("two");
+        assertEquals("two", set.peek());
+        assertEquals("two", set.peek());
+        assertEquals(2, set.size());
+    }
+
+    @Test
+    public void testOfferAndMoveExisting() {
+        set.offer("one");
+        set.offer("two");
+        set.offerAndMove("one");
+        assertEquals("one", set.peek());
+        assertEquals(2, set.size());
+    }
+
+    @Test
+    public void testOfferAndMoveNew() {
+        set.offer("one");
+        set.offer("two");
+        set.offerAndMove("three");
+        assertEquals("three", set.peek());
+        assertEquals(3, set.size());
+    }
+
+}

test/com/dmdirc/util/collections/RollingListTest.java

@@ -136,4 +136,18 @@ public class RollingListTest {
         assertEquals("Bar", rl.getPrevious());
     }
 
+    @Test
+    public void testRemove() {
+        final RollingList<String> rl = new RollingList<>(2);
+
+        rl.add("Foo");
+        rl.add("Bar");
+        rl.remove("Bar");
+        rl.add("Baz");
+
+        assertEquals("Foo", rl.get(0));
+        assertEquals("Baz", rl.get(1));
+        assertFalse(rl.contains("Bar"));
+    }
+
 }

test/com/dmdirc/util/colours/ColourTest.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.util.colours;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+public class ColourTest {
+
+    @Test
+    public void testGetters() {
+        final Colour colour = new Colour(12, 0, 255);
+        assertEquals(12, colour.getRed());
+        assertEquals(0, colour.getGreen());
+        assertEquals(255, colour.getBlue());
+    }
+
+    @Test
+    public void testEquals() {
+        assertTrue(new Colour(1, 2, 3).equals(new Colour(1, 2, 3)));
+        assertTrue(Colour.RED.equals(new Colour(255, 0, 0)));
+        assertFalse(new Colour(3, 2, 1).equals(new Colour(1, 2, 3)));
+        assertFalse(Colour.RED.equals(new Colour(255, 1, 0)));
+    }
+
+    @Test
+    public void testHashcodeSameForEqualColours() {
+        assumeTrue(new Colour(1, 2, 3).equals(new Colour(1, 2, 3)));
+        assertEquals(new Colour(1, 2, 3).hashCode(), new Colour(1, 2, 3).hashCode());
+
+        assumeTrue(Colour.RED.equals(new Colour(255, 0, 0)));
+        assertEquals(Colour.RED.hashCode(), new Colour(255, 0, 0).hashCode());
+    }
+
+}

test/com/dmdirc/util/colours/ColourUtilsTest.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.util.colours;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ColourUtilsTest {
+
+    @Test
+    public void testGetHexZero() {
+        assertEquals("000000", ColourUtils.getHex(new Colour(0, 0, 0)));
+    }
+
+    @Test
+    public void testGetHexEffs() {
+        assertEquals("ffffff", ColourUtils.getHex(new Colour(255, 255, 255)));
+    }
+
+    @Test
+    public void testGetHexRandom() {
+        assertEquals("44978f", ColourUtils.getHex(new Colour(68, 151, 143)));
+    }
+
+}

test/com/dmdirc/util/validators/ValidatorChainBuilderTest.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.util.validators;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class ValidatorChainBuilderTest {
+
+    @Test
+    public void testEmptyBuilder() {
+        final ValidatorChain<String> validatorChain = ValidatorChain.<String>builder().build();
+
+        assertFalse(validatorChain.validate("test").isFailure());
+        assertFalse(validatorChain.validate("").isFailure());
+    }
+
+    @Test
+    public void testBuilderWithMultipleValidators() {
+        final ValidatorChain<String> validatorChain = ValidatorChain.<String>builder()
+                .addValidator(new StringLengthValidator(0, 5))
+                .addValidator(new NotEmptyValidator())
+                .build();
+
+        assertFalse(validatorChain.validate("test").isFailure());
+        assertTrue(validatorChain.validate("").isFailure());
+        assertTrue(validatorChain.validate("123456").isFailure());
+    }
+
+}