Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-837 e80bd5a27 -> fb5578498
Replace AssertionFailedError in comments with AssertionError Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fb557849 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fb557849 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fb557849 Branch: refs/heads/feature/GEODE-837 Commit: fb5578498fb9683c02b91e44fae2b92f73470b04 Parents: e80bd5a Author: Kirk Lund <[email protected]> Authored: Thu Jun 2 09:56:30 2016 -0700 Committer: Kirk Lund <[email protected]> Committed: Thu Jun 2 09:56:30 2016 -0700 ---------------------------------------------------------------------- .../gemfire/internal/cache/PutAllGlobalDUnitTest.java | 2 +- .../gemfire/internal/cache/RemoveDAckDUnitTest.java | 2 +- .../gemfire/internal/cache/RemoveGlobalDUnitTest.java | 2 +- .../cache/persistence/BackupInspectorJUnitTest.java | 9 +-------- .../com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java | 9 --------- .../src/test/java/com/gemstone/gemfire/test/dunit/VM.java | 4 ++-- .../golden/FailWithLineMissingFromEndOfOutputJUnitTest.java | 2 +- .../FailWithLineMissingFromMiddleOfOutputJUnitTest.java | 2 +- 8 files changed, 8 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb557849/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java index 5002634..b9a68ad 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java @@ -160,7 +160,7 @@ public class PutAllGlobalDUnitTest extends JUnit4DistributedTestCase { @Test public void testputAllGlobalRemoteVM() throws Throwable { - // Test Fails: AssertionFailedError: Should have thrown TimeoutException + // Test Fails: AssertionError: Should have thrown TimeoutException Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb557849/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java index 4a51cda..43021e0 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java @@ -125,7 +125,7 @@ public class RemoveDAckDUnitTest extends JUnit4DistributedTestCase { @Test public void testRemoveMultiVM(){ - //Commented the Test.As it is failing @ line no 133 : AssertionFailedError + //Commented the Test.As it is failing @ line no 133 : AssertionError Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb557849/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java index 9f42f7f..9478a15 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java @@ -170,7 +170,7 @@ public class RemoveGlobalDUnitTest extends JUnit4DistributedTestCase { @Test public void testRemoveGlobalMultiVM() throws Throwable{ - //Commented the Test.As it is failing @ line no 145 : AssertionFailedError + //Commented the Test.As it is failing @ line no 145 : AssertionError SerializableRunnable createSimpleRegion = new CacheSerializableRunnable("create region with cache writer"){ public void run2() throws CacheException{ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb557849/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java index dbb58bc..54c1f61 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/BackupInspectorJUnitTest.java @@ -35,14 +35,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** * TODO: fails when running integrationTest from gradle command-line on Windows 7 - * -com.gemstone.gemfire.internal.cache.DiskRegionJUnitTest > testAssertionErrorIfMissingOplog FAILED - junit.framework.AssertionFailedError - at junit.framework.Assert.fail(Assert.java:55) - at junit.framework.Assert.assertTrue(Assert.java:22) - at junit.framework.Assert.assertTrue(Assert.java:31) - at com.gemstone.gemfire.internal.cache.DiskRegionJUnitTest.testAssertionErrorIfMissingOplog(DiskRegionJUnitTest.java:2630) - * + * * Tests for the BackupInspector. */ @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb557849/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java index 93d07de..18e2055 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java @@ -65,15 +65,6 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** * TODO: fails (on Windows 7?) - * -com.gemstone.gemfire.pdx.AutoSerializableJUnitTest > testMultipleClassLoaders FAILED - junit.framework.AssertionFailedError - at junit.framework.Fail(Assert.java:55) - at junit.framework.Assert.assertTrue(Assert.java:22) - at junit.framework.Assert.assertFalse(Assert.java:39) - at junit.framework.Assert.assertFalse(Assert.java:47) - at junit.framework.TestCase.assertFalse(TestCase.java:219) - at com.gemstone.gemfire.pdx.AutoSerializableJUnitTest.testMultipleClassLoaders(AutoSerializableJUnitTest.java:1218) */ @Category(IntegrationTest.class) public class AutoSerializableJUnitTest { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb557849/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java index 8391ffa..7abfc4f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java @@ -322,9 +322,9 @@ public class VM implements Serializable { /** * Invokes the {@code run} method of a {@link Runnable} in this {@code VM}. - * If the invocation throws AssertionFailedError, and repeatTimeoutMs + * If the invocation throws AssertionError, and repeatTimeoutMs * is >0, the {@code run} method is invoked repeatedly until it - * either succeeds, or repeatTimeoutMs has passed. The AssertionFailedError + * either succeeds, or repeatTimeoutMs has passed. The AssertionError * is thrown back to the sender of this method if {@code run} has not * completed successfully before repeatTimeoutMs has passed. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb557849/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java index f645213..8b45e3f 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java @@ -63,7 +63,7 @@ public class FailWithLineMissingFromEndOfOutputJUnitTest extends FailOutputTestC assertOutputMatchesGoldenFile(process.getOutput(), goldenString); fail("assertOutputMatchesGoldenFile should have failed due to " + problem()); } catch (AssertionError expected) { - assertTrue("AssertionFailedError message should contain \"" + problem() + "\"", + assertTrue("AssertionError message should contain \"" + problem() + "\"", expected.getMessage().contains(problem())); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb557849/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java index 4b7897f..f4769d0 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java @@ -62,7 +62,7 @@ public class FailWithLineMissingFromMiddleOfOutputJUnitTest extends FailOutputTe assertOutputMatchesGoldenFile(process.getOutput(), goldenString); fail("assertOutputMatchesGoldenFile should have failed due to " + problem()); } catch (AssertionError expected) { - assertTrue("AssertionFailedError message should contain \"" + problem() + "\"", + assertTrue("AssertionError message should contain \"" + problem() + "\"", expected.getMessage().contains(problem())); } }
