Fixes the compile errors caused by the previous commit in a test

1 files changed, 57 insertions, 57 deletions

diff --git a/ardor3d-core/src/test/java/com/ardor3d/input/logical/TestStandardConditions.java b/ardor3d-core/src/test/java/com/ardor3d/input/logical/TestStandardConditions.java
index b9350a2..e27161f 100644
--- a/ardor3d-core/src/test/java/com/ardor3d/input/logical/TestStandardConditions.java
+++ b/ardor3d-core/src/test/java/com/ardor3d/input/logical/TestStandardConditions.java
@@ -49,16 +49,16 @@ public class TestStandardConditions {
         is2 = new InputState(aDown, ms, cs);
         is3 = new InputState(bDown, ms, cs);
 
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is1, is1)));
-        Assert.assertTrue("down", kh.apply(new TwoInputStates(is1, is2)));
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is1, is3)));
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is2, is3)));
-        Assert.assertTrue("not down", kh.apply(new TwoInputStates(is2, is2)));
-
-        Assert.assertFalse("empty1", kh.apply(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
-        Assert.assertFalse("empty2", kh.apply(new TwoInputStates(is1, InputState.EMPTY)));
-        Assert.assertFalse("empty3", kh.apply(new TwoInputStates(InputState.EMPTY, is1)));
-        Assert.assertTrue("empty4", kh.apply(new TwoInputStates(InputState.EMPTY, is2)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is1, is1)));
+        Assert.assertTrue("down", kh.test(new TwoInputStates(is1, is2)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is1, is3)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is2, is3)));
+        Assert.assertTrue("not down", kh.test(new TwoInputStates(is2, is2)));
+
+        Assert.assertFalse("empty1", kh.test(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
+        Assert.assertFalse("empty2", kh.test(new TwoInputStates(is1, InputState.EMPTY)));
+        Assert.assertFalse("empty3", kh.test(new TwoInputStates(InputState.EMPTY, is1)));
+        Assert.assertTrue("empty4", kh.test(new TwoInputStates(InputState.EMPTY, is2)));
     }
 
     @Test(expected = NullPointerException.class)
@@ -74,16 +74,16 @@ public class TestStandardConditions {
         is2 = new InputState(aDown, ms, cs);
         is3 = new InputState(bDown, ms, cs);
 
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is1, is1)));
-        Assert.assertTrue("down", kh.apply(new TwoInputStates(is1, is2)));
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is1, is3)));
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is2, is3)));
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is2, is2)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is1, is1)));
+        Assert.assertTrue("down", kh.test(new TwoInputStates(is1, is2)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is1, is3)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is2, is3)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is2, is2)));
 
-        Assert.assertFalse("empty1", kh.apply(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
-        Assert.assertFalse("empty2", kh.apply(new TwoInputStates(is1, InputState.EMPTY)));
-        Assert.assertFalse("empty3", kh.apply(new TwoInputStates(InputState.EMPTY, is1)));
-        Assert.assertTrue("empty4", kh.apply(new TwoInputStates(InputState.EMPTY, is2)));
+        Assert.assertFalse("empty1", kh.test(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
+        Assert.assertFalse("empty2", kh.test(new TwoInputStates(is1, InputState.EMPTY)));
+        Assert.assertFalse("empty3", kh.test(new TwoInputStates(InputState.EMPTY, is1)));
+        Assert.assertTrue("empty4", kh.test(new TwoInputStates(InputState.EMPTY, is2)));
     }
 
     @Test(expected = NullPointerException.class)
@@ -99,16 +99,16 @@ public class TestStandardConditions {
         is2 = new InputState(aDown, ms, cs);
         is3 = new InputState(bDown, ms, cs);
 
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is1, is1)));
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is1, is2)));
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is1, is3)));
-        Assert.assertTrue("not down", kh.apply(new TwoInputStates(is2, is3)));
-        Assert.assertFalse("not down", kh.apply(new TwoInputStates(is2, is2)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is1, is1)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is1, is2)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is1, is3)));
+        Assert.assertTrue("not down", kh.test(new TwoInputStates(is2, is3)));
+        Assert.assertFalse("not down", kh.test(new TwoInputStates(is2, is2)));
 
-        Assert.assertFalse("empty1", kh.apply(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
-        Assert.assertFalse("empty2", kh.apply(new TwoInputStates(is1, InputState.EMPTY)));
-        Assert.assertFalse("empty3", kh.apply(new TwoInputStates(InputState.EMPTY, is1)));
-        Assert.assertFalse("empty4", kh.apply(new TwoInputStates(InputState.EMPTY, is2)));
+        Assert.assertFalse("empty1", kh.test(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
+        Assert.assertFalse("empty2", kh.test(new TwoInputStates(is1, InputState.EMPTY)));
+        Assert.assertFalse("empty3", kh.test(new TwoInputStates(InputState.EMPTY, is1)));
+        Assert.assertFalse("empty4", kh.test(new TwoInputStates(InputState.EMPTY, is2)));
     }
 
     @Test(expected = NullPointerException.class)
@@ -131,17 +131,17 @@ public class TestStandardConditions {
         is4 = new InputState(ks, ms4, cs);
         is5 = new InputState(ks, ms5, cs);
 
-        Assert.assertFalse("mm1", mm.apply(new TwoInputStates(is1, is1)));
-        Assert.assertTrue("mm2", mm.apply(new TwoInputStates(is1, is2)));
-        Assert.assertFalse("mm3", mm.apply(new TwoInputStates(is2, is3)));
-        Assert.assertTrue("mm4", mm.apply(new TwoInputStates(is3, is4)));
-        Assert.assertTrue("mm5", mm.apply(new TwoInputStates(is4, is5)));
-        Assert.assertFalse("mm6", mm.apply(new TwoInputStates(is2, is2)));
-
-        Assert.assertFalse("empty1", mm.apply(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
-        Assert.assertFalse("empty2", mm.apply(new TwoInputStates(is1, InputState.EMPTY)));
-        Assert.assertFalse("empty3", mm.apply(new TwoInputStates(InputState.EMPTY, is1)));
-        Assert.assertTrue("empty4", mm.apply(new TwoInputStates(InputState.EMPTY, is2)));
+        Assert.assertFalse("mm1", mm.test(new TwoInputStates(is1, is1)));
+        Assert.assertTrue("mm2", mm.test(new TwoInputStates(is1, is2)));
+        Assert.assertFalse("mm3", mm.test(new TwoInputStates(is2, is3)));
+        Assert.assertTrue("mm4", mm.test(new TwoInputStates(is3, is4)));
+        Assert.assertTrue("mm5", mm.test(new TwoInputStates(is4, is5)));
+        Assert.assertFalse("mm6", mm.test(new TwoInputStates(is2, is2)));
+
+        Assert.assertFalse("empty1", mm.test(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
+        Assert.assertFalse("empty2", mm.test(new TwoInputStates(is1, InputState.EMPTY)));
+        Assert.assertFalse("empty3", mm.test(new TwoInputStates(InputState.EMPTY, is1)));
+        Assert.assertTrue("empty4", mm.test(new TwoInputStates(InputState.EMPTY, is2)));
     }
 
     @Test
@@ -159,16 +159,16 @@ public class TestStandardConditions {
         is4 = new InputState(ks, ms4, cs);
         is5 = new InputState(ks, ms5, cs);
 
-        Assert.assertFalse("mm1", mm.apply(new TwoInputStates(is1, is1)));
-        Assert.assertFalse("mm2", mm.apply(new TwoInputStates(is1, is2)));
-        Assert.assertTrue("mm3", mm.apply(new TwoInputStates(is2, is3)));
-        Assert.assertFalse("mm4", mm.apply(new TwoInputStates(is3, is4)));
-        Assert.assertTrue("mm5", mm.apply(new TwoInputStates(is4, is5)));
+        Assert.assertFalse("mm1", mm.test(new TwoInputStates(is1, is1)));
+        Assert.assertFalse("mm2", mm.test(new TwoInputStates(is1, is2)));
+        Assert.assertTrue("mm3", mm.test(new TwoInputStates(is2, is3)));
+        Assert.assertFalse("mm4", mm.test(new TwoInputStates(is3, is4)));
+        Assert.assertTrue("mm5", mm.test(new TwoInputStates(is4, is5)));
 
-        Assert.assertFalse("empty1", mm.apply(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
-        Assert.assertFalse("empty2", mm.apply(new TwoInputStates(is1, InputState.EMPTY)));
-        Assert.assertFalse("empty3", mm.apply(new TwoInputStates(InputState.EMPTY, is1)));
-        Assert.assertTrue("empty4", mm.apply(new TwoInputStates(InputState.EMPTY, is3)));
+        Assert.assertFalse("empty1", mm.test(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
+        Assert.assertFalse("empty2", mm.test(new TwoInputStates(is1, InputState.EMPTY)));
+        Assert.assertFalse("empty3", mm.test(new TwoInputStates(InputState.EMPTY, is1)));
+        Assert.assertTrue("empty4", mm.test(new TwoInputStates(InputState.EMPTY, is3)));
     }
 
     @Test
@@ -186,15 +186,15 @@ public class TestStandardConditions {
         is4 = new InputState(ks, ms4, cs);
         is5 = new InputState(ks, ms5, cs);
 
-        Assert.assertFalse("mm1", mm.apply(new TwoInputStates(is1, is1)));
-        Assert.assertFalse("mm2", mm.apply(new TwoInputStates(is1, is2)));
-        Assert.assertTrue("mm3", mm.apply(new TwoInputStates(is2, is3)));
-        Assert.assertTrue("mm4", mm.apply(new TwoInputStates(is3, is4)));
-        Assert.assertFalse("mm5", mm.apply(new TwoInputStates(is4, is5)));
+        Assert.assertFalse("mm1", mm.test(new TwoInputStates(is1, is1)));
+        Assert.assertFalse("mm2", mm.test(new TwoInputStates(is1, is2)));
+        Assert.assertTrue("mm3", mm.test(new TwoInputStates(is2, is3)));
+        Assert.assertTrue("mm4", mm.test(new TwoInputStates(is3, is4)));
+        Assert.assertFalse("mm5", mm.test(new TwoInputStates(is4, is5)));
 
-        Assert.assertFalse("empty1", mm.apply(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
-        Assert.assertFalse("empty2", mm.apply(new TwoInputStates(is1, InputState.EMPTY)));
-        Assert.assertFalse("empty3", mm.apply(new TwoInputStates(InputState.EMPTY, is1)));
-        Assert.assertTrue("empty4", mm.apply(new TwoInputStates(InputState.EMPTY, is3)));
+        Assert.assertFalse("empty1", mm.test(new TwoInputStates(InputState.EMPTY, InputState.EMPTY)));
+        Assert.assertFalse("empty2", mm.test(new TwoInputStates(is1, InputState.EMPTY)));
+        Assert.assertFalse("empty3", mm.test(new TwoInputStates(InputState.EMPTY, is1)));
+        Assert.assertTrue("empty4", mm.test(new TwoInputStates(InputState.EMPTY, is3)));
     }
 }