Added test fixes

Author: KodeMunkie

doc/changes.txt

@@ -1,6 +1,12 @@
 Image to ZX Spec Changes
 ------------------------
 
+Version 2.1.0
+- Fixed Gigascreen palette choice bug in converter
+- Improved/added new colour distance algorithms (used to determine which palette colour should be used)
+- Fixed Ordered Dither algorithm
+- Removed broken incompatible ordered dither strategies (e.g. "Lightness")
+
 Version 2.0.2
 - Fixed related bugs to do with output image naming and missing output images
 - Updated copyright

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>uk.co.silentsoftware</groupId>
 	<artifactId>imagetozxspec</artifactId>
-	<version>2.0.2</version>
+	<version>2.1.0-alpha</version>
 	<name>Image To ZX Spec</name>
 	<description>Image converter for the ZX Spectrum</description>
 	<licenses>

src/test/groovy/uk/co/silentsoftware/core/attributestrategy/ForceReducedHalfBrightAttributeStrategyTest.groovy

@@ -54,6 +54,6 @@ class ForceReducedHalfBrightAttributeStrategyTest {
 		AttributeStrategy strategy = new ForceReducedHalfBrightAttributeStrategy()
 		int[] result = strategy.enforceAttributeRule(0xFF00CDCDi, 0xFFCD00CDi)
 		Assert.assertEquals(0xFFCDCDCDi,result[0])
-		Assert.assertEquals(0xFFCDCDCDi,result[1]) // Switch to half bright
+		Assert.assertEquals(0xFFCD0000i,result[1]) // Switch to half bright
 	}
 }

src/test/groovy/uk/co/silentsoftware/core/colourstrategy/ColourChoiceStrategyTest.groovy

@@ -27,9 +27,7 @@ class ColourChoiceStrategyTest {
 	void testMonochromePaletteStrategyColour() {
 		ColourChoiceStrategy strategy = new MonochromePaletteStrategy()
 		int result = strategy.chooseBestPaletteMatch(0xFFBBCCDDi, createPopularColours())
-
-		// Just passes back the same value
-		Assert.assertEquals(0xFFBBCCDDi, result)
+		Assert.assertEquals((int)0xFFFFFFFF, result)
 	}
 
 	@Test(expected=UnsupportedOperationException.class)

src/test/groovy/uk/co/silentsoftware/core/converters/image/orderedditherstrategy/AbstractOrderedDitherStrategyTest.groovy

@@ -50,23 +50,23 @@ class AbstractOrderedDitherStrategyTest {
 	}
 
 	@Test
-	void testApplyDitherWillFullColour() {
+	void testApplyDitherWithFullColour() {
 		OptionsObject.getInstance().setColourMode(OptionsObject.getInstance().getColourModes()[0])
 		int[] dither = strategy.applyDither(createRgbStrip())
-		Assert.assertArrayEquals([0xFFCDCDCD,0xFF000000,0xFF000000,0xFFCDCDCD] as int[], dither)
+		Assert.assertArrayEquals([0xFF2D2D2D,0xFF000000,0xFF000000,0xFF2D2D2D] as int[], dither)
 	}
 
 	@Test
 	void testApplyDitherWithGigascreen() {
 		OptionsObject.getInstance().setColourMode(OptionsObject.getInstance().getColourModes()[1])
 		int[] dither = strategy.applyDither(createRgbStrip())
-		Assert.assertArrayEquals([0xFF7F7F7F,0xFF000000,0xFF000000,0xFF7F7F7F] as int[], dither)
+		Assert.assertArrayEquals([0xFF3E3E3E,0xFF000000,0xFF000000,0xFF3E3E3E] as int[], dither)
 	}
 
 	@Test
 	void testApplyDitherWithMonochrome() {
 		OptionsObject.getInstance().setColourMode(OptionsObject.getInstance().getColourModes()[2])
 		int[] dither = strategy.applyDither(createRgbStrip())
-		Assert.assertArrayEquals([0xFFFFFFFF,0xFF000000,0xFF000000,0xFFFFFFFF] as int[], dither)
+		Assert.assertArrayEquals([0xFF282828,0xFF000000,0xFF000000,0xFF282828] as int[], dither)
 	}
 }