1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-08 06:01:07 +01:00

Improve ConsistentColor API

- Rename Context to ConsistentColorSettings
- Add convenience RGBFrom(CharSequence) method
- Remove _angle in code

SMACK-800.
This commit is contained in:
Florian Schmaus 2018-02-10 21:03:17 +01:00
parent e0af3db189
commit e38f80b3cb
2 changed files with 45 additions and 48 deletions

View file

@ -21,6 +21,8 @@ import static junit.framework.TestCase.assertTrue;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smackx.colors.ConsistentColor.Deficiency;
import org.junit.Test;
public class ConsistentColorsTest extends SmackTestSuite {
@ -28,15 +30,9 @@ public class ConsistentColorsTest extends SmackTestSuite {
// Margin of error we allow due to floating point arithmetic
private static final float EPS = 0.001f;
private static final ConsistentColor.Context noDeficiency = new ConsistentColor.Context();
private static final ConsistentColor.Context redGreenDeficiency = new ConsistentColor.Context();
private static final ConsistentColor.Context blueBlindnessDeficiency = new ConsistentColor.Context();
public ConsistentColorsTest() {
noDeficiency.deactivateDeficiencyCorrection();
redGreenDeficiency.activateRedGreenBlindnessCorrection();
blueBlindnessDeficiency.activateBlueBlindnessCorrection();
}
private static final ConsistentColor.ConsistentColorSettings noDeficiency = new ConsistentColor.ConsistentColorSettings(Deficiency.none);
private static final ConsistentColor.ConsistentColorSettings redGreenDeficiency = new ConsistentColor.ConsistentColorSettings(Deficiency.redGreenBlindness);
private static final ConsistentColor.ConsistentColorSettings blueBlindnessDeficiency = new ConsistentColor.ConsistentColorSettings(Deficiency.blueBlindness);
/*
Below tests check the test vectors from XEP-0392 §13.2.
@ -138,18 +134,6 @@ public class ConsistentColorsTest extends SmackTestSuite {
assertRGBEquals(expected, actual, EPS);
}
@Test
public void contextGetterTest() {
ConsistentColor.Context context = new ConsistentColor.Context();
assertEquals(ConsistentColor.Deficiency.none, context.getDeficiency());
context.activateBlueBlindnessCorrection();
assertEquals(ConsistentColor.Deficiency.blueBlindness, context.getDeficiency());
context.activateRedGreenBlindnessCorrection();
assertEquals(ConsistentColor.Deficiency.redGreenBlindness, context.getDeficiency());
context.deactivateDeficiencyCorrection();
assertEquals(ConsistentColor.Deficiency.none, context.getDeficiency());
}
/**
* Check, whether the values of two float arrays of size 3 are pairwise equal with an allowed error of eps.
*