From 289fd3897edd14a4ec0688c2c529e0c7b37fb138 Mon Sep 17 00:00:00 2001 From: zhoudaxia <1018795633@qq.cin> Date: Thu, 1 Sep 2016 21:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=A5=E9=87=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../robocode/test/robots/TestBodyTurnRate.java | 136 +++++++++--------- .../robocode/test/robots/TestGunTurnRate.java | 32 ++--- .../robocode/test/robots/TestMaxTurnRate.java | 52 +++---- .../robots/TestRadarTurnRateAndSetAdjust.java | 28 ++-- 4 files changed, 124 insertions(+), 124 deletions(-) diff --git a/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestBodyTurnRate.java b/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestBodyTurnRate.java index 5ec9dc7..ff0cbd8 100644 --- a/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestBodyTurnRate.java +++ b/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestBodyTurnRate.java @@ -40,89 +40,89 @@ public class TestBodyTurnRate extends RobocodeTestBed { if (event.getTurnSnapshot().getTurn() == 60) { final String out = buf.toString(); - Assert.assertTrue(out.contains("1: 0.0, -10.0") | out.contains("1: 0.0, -9.9999999999")); - Assert.assertTrue(out.contains("2: 1.0, -9.25") | out.contains("2: 1.0, -9.2499999999")); - Assert.assertTrue(out.contains("3: 2.0, -8.5") | out.contains("3: 2.0, -8.4999999999")); - Assert.assertTrue(out.contains("4: 3.0, -7.75") | out.contains("4: 3.0, -7.7499999999")); - Assert.assertTrue(out.contains("5: 4.0, -7.0") | out.contains("5: 4.0, -6.9999999999")); - Assert.assertTrue(out.contains("6: 5.0, -6.25") | out.contains("6: 5.0, -6.2499999999")); - Assert.assertTrue(out.contains("7: 6.0, -5.5") | out.contains("7: 6.0, -5.4999999999")); - Assert.assertTrue(out.contains("8: 7.0, -4.75") | out.contains("8: 7.0, -4.7499999999")); - Assert.assertTrue(out.contains("9: 8.0, -4.0") | out.contains("9: 8.0, -3.9999999999")); + Assert.assertTrue(out.contains("1: 0.0, -10.0") || out.contains("1: 0.0, -9.9999999999")); + Assert.assertTrue(out.contains("2: 1.0, -9.25") || out.contains("2: 1.0, -9.2499999999")); + Assert.assertTrue(out.contains("3: 2.0, -8.5") || out.contains("3: 2.0, -8.4999999999")); + Assert.assertTrue(out.contains("4: 3.0, -7.75") || out.contains("4: 3.0, -7.7499999999")); + Assert.assertTrue(out.contains("5: 4.0, -7.0") || out.contains("5: 4.0, -6.9999999999")); + Assert.assertTrue(out.contains("6: 5.0, -6.25") || out.contains("6: 5.0, -6.2499999999")); + Assert.assertTrue(out.contains("7: 6.0, -5.5") || out.contains("7: 6.0, -5.4999999999")); + Assert.assertTrue(out.contains("8: 7.0, -4.75") || out.contains("8: 7.0, -4.7499999999")); + Assert.assertTrue(out.contains("9: 8.0, -4.0") || out.contains("9: 8.0, -3.9999999999")); - Assert.assertTrue(out.contains("10: 8.0, 0.0") | out.contains("10: 8.0, -0.0")); - Assert.assertTrue(out.contains("11: 6.0, 0.0") | out.contains("11: 6.0, -0.0")); - Assert.assertTrue(out.contains("12: 4.0, 0.0") | out.contains("12: 4.0, -0.0")); - Assert.assertTrue(out.contains("13: 2.0, 0.0") | out.contains("13: 2.0, -0.0")); + Assert.assertTrue(out.contains("10: 8.0, 0.0") || out.contains("10: 8.0, -0.0")); + Assert.assertTrue(out.contains("11: 6.0, 0.0") || out.contains("11: 6.0, -0.0")); + Assert.assertTrue(out.contains("12: 4.0, 0.0") || out.contains("12: 4.0, -0.0")); + Assert.assertTrue(out.contains("13: 2.0, 0.0") || out.contains("13: 2.0, -0.0")); Assert.assertTrue( - out.contains("14: 0.0, 0.0") | out.contains("14: 0.0, -0.0") | out.contains("14: -0.0, 0.0") - | out.contains("14: -0.0, -0.0")); + out.contains("14: 0.0, 0.0") || out.contains("14: 0.0, -0.0") || out.contains("14: -0.0, 0.0") + || out.contains("14: -0.0, -0.0")); Assert.assertTrue( - out.contains("15: 0.0, 0.0") | out.contains("15: 0.0, -0.0") | out.contains("15: -0.0, 0.0") - | out.contains("15: -0.0, -0.0")); + out.contains("15: 0.0, 0.0") || out.contains("15: 0.0, -0.0") || out.contains("15: -0.0, 0.0") + || out.contains("15: -0.0, -0.0")); - Assert.assertTrue(out.contains("16: 0.0, 10.0") | out.contains("16: 0.0, 9.9999999999")); - Assert.assertTrue(out.contains("17: 1.0, 9.25") | out.contains("17: 1.0, 9.2499999999")); - Assert.assertTrue(out.contains("18: 2.0, 8.5") | out.contains("18: 2.0, 8.4999999999")); - Assert.assertTrue(out.contains("19: 3.0, 7.75") | out.contains("19: 3.0, 7.7499999999")); - Assert.assertTrue(out.contains("20: 4.0, 7.0") | out.contains("20: 4.0, 6.9999999999")); - Assert.assertTrue(out.contains("21: 5.0, 6.25") | out.contains("21: 5.0, 6.2499999999")); - Assert.assertTrue(out.contains("22: 6.0, 5.5") | out.contains("22: 6.0, 5.4999999999")); - Assert.assertTrue(out.contains("23: 7.0, 4.75") | out.contains("23: 7.0, 4.7499999999")); - Assert.assertTrue(out.contains("24: 8.0, 4.0") | out.contains("24: 8.0, 3.9999999999")); + Assert.assertTrue(out.contains("16: 0.0, 10.0") || out.contains("16: 0.0, 9.9999999999")); + Assert.assertTrue(out.contains("17: 1.0, 9.25") || out.contains("17: 1.0, 9.2499999999")); + Assert.assertTrue(out.contains("18: 2.0, 8.5") || out.contains("18: 2.0, 8.4999999999")); + Assert.assertTrue(out.contains("19: 3.0, 7.75") || out.contains("19: 3.0, 7.7499999999")); + Assert.assertTrue(out.contains("20: 4.0, 7.0") || out.contains("20: 4.0, 6.9999999999")); + Assert.assertTrue(out.contains("21: 5.0, 6.25") || out.contains("21: 5.0, 6.2499999999")); + Assert.assertTrue(out.contains("22: 6.0, 5.5") || out.contains("22: 6.0, 5.4999999999")); + Assert.assertTrue(out.contains("23: 7.0, 4.75") || out.contains("23: 7.0, 4.7499999999")); + Assert.assertTrue(out.contains("24: 8.0, 4.0") || out.contains("24: 8.0, 3.9999999999")); - Assert.assertTrue(out.contains("25: 8.0, 0.0") | out.contains("25: 8.0, -0.0")); - Assert.assertTrue(out.contains("26: 6.0, 0.0") | out.contains("26: 6.0, -0.0")); - Assert.assertTrue(out.contains("27: 4.0, 0.0") | out.contains("27: 4.0, -0.0")); - Assert.assertTrue(out.contains("28: 2.0, 0.0") | out.contains("28: 2.0, -0.0")); + Assert.assertTrue(out.contains("25: 8.0, 0.0") || out.contains("25: 8.0, -0.0")); + Assert.assertTrue(out.contains("26: 6.0, 0.0") || out.contains("26: 6.0, -0.0")); + Assert.assertTrue(out.contains("27: 4.0, 0.0") || out.contains("27: 4.0, -0.0")); + Assert.assertTrue(out.contains("28: 2.0, 0.0") || out.contains("28: 2.0, -0.0")); Assert.assertTrue( - out.contains("29: 0.0, 0.0") | out.contains("29: 0.0, -0.0") | out.contains("29: -0.0, 0.0") - | out.contains("29: -0.0, -0.0")); + out.contains("29: 0.0, 0.0") || out.contains("29: 0.0, -0.0") || out.contains("29: -0.0, 0.0") + || out.contains("29: -0.0, -0.0")); Assert.assertTrue( - out.contains("30: 0.0, 0.0") | out.contains("30: 0.0, -0.0") | out.contains("30: -0.0, 0.0") - | out.contains("30: -0.0, -0.0")); + out.contains("30: 0.0, 0.0") || out.contains("30: 0.0, -0.0") || out.contains("30: -0.0, 0.0") + || out.contains("30: -0.0, -0.0")); - Assert.assertTrue(out.contains("31: 0.0, 10.0") | out.contains("31: 0.0, 9.9999999999")); - Assert.assertTrue(out.contains("32: -1.0, 9.25") | out.contains("32: -1.0, 9.2499999999")); - Assert.assertTrue(out.contains("33: -2.0, 8.5") | out.contains("33: -2.0, 8.4999999999")); - Assert.assertTrue(out.contains("34: -3.0, 7.75") | out.contains("34: -3.0, 7.7499999999")); - Assert.assertTrue(out.contains("35: -4.0, 7.0") | out.contains("35: -4.0, 6.9999999999")); - Assert.assertTrue(out.contains("36: -5.0, 6.25") | out.contains("36: -5.0, 6.2499999999")); - Assert.assertTrue(out.contains("37: -6.0, 5.5") | out.contains("37: -6.0, 5.4999999999")); - Assert.assertTrue(out.contains("38: -7.0, 4.75") | out.contains("38: -7.0, 4.7499999999")); - Assert.assertTrue(out.contains("39: -8.0, 4.0") | out.contains("39: -8.0, 3.9999999999")); + Assert.assertTrue(out.contains("31: 0.0, 10.0") || out.contains("31: 0.0, 9.9999999999")); + Assert.assertTrue(out.contains("32: -1.0, 9.25") || out.contains("32: -1.0, 9.2499999999")); + Assert.assertTrue(out.contains("33: -2.0, 8.5") || out.contains("33: -2.0, 8.4999999999")); + Assert.assertTrue(out.contains("34: -3.0, 7.75") || out.contains("34: -3.0, 7.7499999999")); + Assert.assertTrue(out.contains("35: -4.0, 7.0") || out.contains("35: -4.0, 6.9999999999")); + Assert.assertTrue(out.contains("36: -5.0, 6.25") || out.contains("36: -5.0, 6.2499999999")); + Assert.assertTrue(out.contains("37: -6.0, 5.5") || out.contains("37: -6.0, 5.4999999999")); + Assert.assertTrue(out.contains("38: -7.0, 4.75") || out.contains("38: -7.0, 4.7499999999")); + Assert.assertTrue(out.contains("39: -8.0, 4.0") || out.contains("39: -8.0, 3.9999999999")); - Assert.assertTrue(out.contains("40: -8.0, 0.0") | out.contains("40: -8.0, -0.0")); - Assert.assertTrue(out.contains("41: -6.0, 0.0") | out.contains("41: -6.0, -0.0")); - Assert.assertTrue(out.contains("42: -4.0, 0.0") | out.contains("42: -4.0, -0.0")); - Assert.assertTrue(out.contains("43: -2.0, 0.0") | out.contains("43: -2.0, -0.0")); + Assert.assertTrue(out.contains("40: -8.0, 0.0") || out.contains("40: -8.0, -0.0")); + Assert.assertTrue(out.contains("41: -6.0, 0.0") || out.contains("41: -6.0, -0.0")); + Assert.assertTrue(out.contains("42: -4.0, 0.0") || out.contains("42: -4.0, -0.0")); + Assert.assertTrue(out.contains("43: -2.0, 0.0") || out.contains("43: -2.0, -0.0")); Assert.assertTrue( - out.contains("44: -0.0, 0.0") | out.contains("44: -0.0, -0.0") | out.contains("44: 0.0, 0.0") - | out.contains("44: 0.0, -0.0")); + out.contains("44: -0.0, 0.0") || out.contains("44: -0.0, -0.0") || out.contains("44: 0.0, 0.0") + || out.contains("44: 0.0, -0.0")); Assert.assertTrue( - out.contains("45: -0.0, 0.0") | out.contains("45: -0.0, -0.0") | out.contains("45: 0.0, 0.0") - | out.contains("45: 0.0, -0.0")); + out.contains("45: -0.0, 0.0") || out.contains("45: -0.0, -0.0") || out.contains("45: 0.0, 0.0") + || out.contains("45: 0.0, -0.0")); - Assert.assertTrue(out.contains("46: 0.0, -10.0") | out.contains("46: 0.0, -9.9999999999")); - Assert.assertTrue(out.contains("47: -1.0, -9.25") | out.contains("47: -1.0, -9.2499999999")); - Assert.assertTrue(out.contains("48: -2.0, -8.5") | out.contains("48: -2.0, -8.4999999999")); - Assert.assertTrue(out.contains("49: -3.0, -7.75") | out.contains("49: -3.0, -7.7499999999")); - Assert.assertTrue(out.contains("50: -4.0, -7.0") | out.contains("50: -4.0, -6.9999999999")); - Assert.assertTrue(out.contains("51: -5.0, -6.25") | out.contains("51: -5.0, -6.2499999999")); - Assert.assertTrue(out.contains("52: -6.0, -5.5") | out.contains("52: -6.0, -5.4999999999")); - Assert.assertTrue(out.contains("53: -7.0, -4.75") | out.contains("53: -7.0, -4.7499999999")); - Assert.assertTrue(out.contains("54: -8.0, -4.0") | out.contains("54: -8.0, -3.9999999999")); + Assert.assertTrue(out.contains("46: 0.0, -10.0") || out.contains("46: 0.0, -9.9999999999")); + Assert.assertTrue(out.contains("47: -1.0, -9.25") || out.contains("47: -1.0, -9.2499999999")); + Assert.assertTrue(out.contains("48: -2.0, -8.5") || out.contains("48: -2.0, -8.4999999999")); + Assert.assertTrue(out.contains("49: -3.0, -7.75") || out.contains("49: -3.0, -7.7499999999")); + Assert.assertTrue(out.contains("50: -4.0, -7.0") || out.contains("50: -4.0, -6.9999999999")); + Assert.assertTrue(out.contains("51: -5.0, -6.25") || out.contains("51: -5.0, -6.2499999999")); + Assert.assertTrue(out.contains("52: -6.0, -5.5") || out.contains("52: -6.0, -5.4999999999")); + Assert.assertTrue(out.contains("53: -7.0, -4.75") || out.contains("53: -7.0, -4.7499999999")); + Assert.assertTrue(out.contains("54: -8.0, -4.0") || out.contains("54: -8.0, -3.9999999999")); - Assert.assertTrue(out.contains("55: -8.0, 0.0") | out.contains("55: -8.0, -0.0")); - Assert.assertTrue(out.contains("56: -6.0, 0.0") | out.contains("56: -6.0, -0.0")); - Assert.assertTrue(out.contains("57: -4.0, 0.0") | out.contains("57: -4.0, -0.0")); - Assert.assertTrue(out.contains("58: -2.0, 0.0") | out.contains("58: -2.0, -0.0")); + Assert.assertTrue(out.contains("55: -8.0, 0.0") || out.contains("55: -8.0, -0.0")); + Assert.assertTrue(out.contains("56: -6.0, 0.0") || out.contains("56: -6.0, -0.0")); + Assert.assertTrue(out.contains("57: -4.0, 0.0") || out.contains("57: -4.0, -0.0")); + Assert.assertTrue(out.contains("58: -2.0, 0.0") || out.contains("58: -2.0, -0.0")); Assert.assertTrue( - out.contains("59: -0.0, 0.0") | out.contains("59: -0.0, -0.0") | out.contains("59: 0.0, 0.0") - | out.contains("59: 0.0, -0.0")); + out.contains("59: -0.0, 0.0") || out.contains("59: -0.0, -0.0") || out.contains("59: 0.0, 0.0") + || out.contains("59: 0.0, -0.0")); Assert.assertTrue( - out.contains("60: -0.0, 0.0") | out.contains("60: -0.0, -0.0") | out.contains("60: 0.0, 0.0") - | out.contains("60: 0.0, -0.0")); + out.contains("60: -0.0, 0.0") || out.contains("60: -0.0, -0.0") || out.contains("60: 0.0, 0.0") + || out.contains("60: 0.0, -0.0")); } } } diff --git a/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestGunTurnRate.java b/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestGunTurnRate.java index c19543e..7c22850 100644 --- a/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestGunTurnRate.java +++ b/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestGunTurnRate.java @@ -40,22 +40,22 @@ public class TestGunTurnRate extends RobocodeTestBed { if (event.getTurnSnapshot().getTurn() == 16) { final String out = buf.toString(); - Assert.assertTrue(out.contains("1: -20.0") | out.contains("1: -19.9999999999")); - Assert.assertTrue(out.contains("2: -20.0") | out.contains("2: -19.9999999999")); - Assert.assertTrue(out.contains("3: 20.0") | out.contains("3: 19.9999999999")); - Assert.assertTrue(out.contains("4: 20.0") | out.contains("4: 19.9999999999")); - Assert.assertTrue(out.contains("5: -25.0") | out.contains("5: -24.9999999999")); - Assert.assertTrue(out.contains("6: -25.0") | out.contains("6: -24.9999999999")); - Assert.assertTrue(out.contains("7: 25.0") | out.contains("7: 24.9999999999")); - Assert.assertTrue(out.contains("8: 25.0") | out.contains("8: 24.9999999999")); - Assert.assertTrue(out.contains("9: -30.0") | out.contains("9: -29.9999999999")); - Assert.assertTrue(out.contains("10: -30.0") | out.contains("10: -29.9999999999")); - Assert.assertTrue(out.contains("11: 30.0") | out.contains("11: 29.9999999999")); - Assert.assertTrue(out.contains("12: 30.0") | out.contains("12: 29.9999999999")); - Assert.assertTrue(out.contains("13: -10.0") | out.contains("13: -9.9999999999")); - Assert.assertTrue(out.contains("14: -10.0") | out.contains("14: -9.9999999999")); - Assert.assertTrue(out.contains("15: 10.0") | out.contains("15: 9.9999999999")); - Assert.assertTrue(out.contains("16: 10.0") | out.contains("16: 9.9999999999")); + Assert.assertTrue(out.contains("1: -20.0") || out.contains("1: -19.9999999999")); + Assert.assertTrue(out.contains("2: -20.0") || out.contains("2: -19.9999999999")); + Assert.assertTrue(out.contains("3: 20.0") || out.contains("3: 19.9999999999")); + Assert.assertTrue(out.contains("4: 20.0") || out.contains("4: 19.9999999999")); + Assert.assertTrue(out.contains("5: -25.0") || out.contains("5: -24.9999999999")); + Assert.assertTrue(out.contains("6: -25.0") || out.contains("6: -24.9999999999")); + Assert.assertTrue(out.contains("7: 25.0") || out.contains("7: 24.9999999999")); + Assert.assertTrue(out.contains("8: 25.0") || out.contains("8: 24.9999999999")); + Assert.assertTrue(out.contains("9: -30.0") || out.contains("9: -29.9999999999")); + Assert.assertTrue(out.contains("10: -30.0") || out.contains("10: -29.9999999999")); + Assert.assertTrue(out.contains("11: 30.0") || out.contains("11: 29.9999999999")); + Assert.assertTrue(out.contains("12: 30.0") || out.contains("12: 29.9999999999")); + Assert.assertTrue(out.contains("13: -10.0") || out.contains("13: -9.9999999999")); + Assert.assertTrue(out.contains("14: -10.0") || out.contains("14: -9.9999999999")); + Assert.assertTrue(out.contains("15: 10.0") || out.contains("15: 9.9999999999")); + Assert.assertTrue(out.contains("16: 10.0") || out.contains("16: 9.9999999999")); } } } diff --git a/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestMaxTurnRate.java b/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestMaxTurnRate.java index b139c08..cd9ef61 100644 --- a/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestMaxTurnRate.java +++ b/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestMaxTurnRate.java @@ -40,33 +40,33 @@ public class TestMaxTurnRate extends RobocodeTestBed { if (event.getTurnSnapshot().getTurn() == 26) { final String out = buf.toString(); - Assert.assertTrue(out.contains("1: 0.0, 0.0") | out.contains("1: 0.0, -0.0")); - Assert.assertTrue(out.contains("2: 0.0, -1.0") | out.contains("2: 0.0, -0.999999999")); - Assert.assertTrue(out.contains("3: 0.0, -2.0") | out.contains("3: 0.0, -1.999999999")); - Assert.assertTrue(out.contains("4: 0.0, -3.0") | out.contains("4: 0.0, -2.999999999")); - Assert.assertTrue(out.contains("5: 0.0, -4.0") | out.contains("5: 0.0, -3.999999999")); - Assert.assertTrue(out.contains("6: 0.0, -5.0") | out.contains("6: 0.0, -4.999999999")); - Assert.assertTrue(out.contains("7: 0.0, -6.0") | out.contains("7: 0.0, -5.999999999")); - Assert.assertTrue(out.contains("8: 0.0, -7.0") | out.contains("8: 0.0, -6.999999999")); - Assert.assertTrue(out.contains("9: 0.0, -8.0") | out.contains("9: 0.0, -7.999999999")); - Assert.assertTrue(out.contains("10: 0.0, -9.0") | out.contains("10: 0.0, -8.999999999")); - Assert.assertTrue(out.contains("11: 0.0, -10.0") | out.contains("11: 0.0, -9.999999999")); - Assert.assertTrue(out.contains("12: 0.0, -10.0") | out.contains("12: 0.0, -9.999999999")); - Assert.assertTrue(out.contains("13: 0.0, -10.0") | out.contains("13: 0.0, -9.999999999")); + Assert.assertTrue(out.contains("1: 0.0, 0.0") || out.contains("1: 0.0, -0.0")); + Assert.assertTrue(out.contains("2: 0.0, -1.0") || out.contains("2: 0.0, -0.999999999")); + Assert.assertTrue(out.contains("3: 0.0, -2.0") || out.contains("3: 0.0, -1.999999999")); + Assert.assertTrue(out.contains("4: 0.0, -3.0") || out.contains("4: 0.0, -2.999999999")); + Assert.assertTrue(out.contains("5: 0.0, -4.0") || out.contains("5: 0.0, -3.999999999")); + Assert.assertTrue(out.contains("6: 0.0, -5.0") || out.contains("6: 0.0, -4.999999999")); + Assert.assertTrue(out.contains("7: 0.0, -6.0") || out.contains("7: 0.0, -5.999999999")); + Assert.assertTrue(out.contains("8: 0.0, -7.0") || out.contains("8: 0.0, -6.999999999")); + Assert.assertTrue(out.contains("9: 0.0, -8.0") || out.contains("9: 0.0, -7.999999999")); + Assert.assertTrue(out.contains("10: 0.0, -9.0") || out.contains("10: 0.0, -8.999999999")); + Assert.assertTrue(out.contains("11: 0.0, -10.0") || out.contains("11: 0.0, -9.999999999")); + Assert.assertTrue(out.contains("12: 0.0, -10.0") || out.contains("12: 0.0, -9.999999999")); + Assert.assertTrue(out.contains("13: 0.0, -10.0") || out.contains("13: 0.0, -9.999999999")); - Assert.assertTrue(out.contains("14: 0.0, 0.0") | out.contains("14: 0.0, -0.0")); - Assert.assertTrue(out.contains("15: 0.0, 1.0") | out.contains("15: 0.0, 0.999999999")); - Assert.assertTrue(out.contains("16: 0.0, 2.0") | out.contains("16: 0.0, 1.999999999")); - Assert.assertTrue(out.contains("17: 0.0, 3.0") | out.contains("17: 0.0, 2.999999999")); - Assert.assertTrue(out.contains("18: 0.0, 4.0") | out.contains("18: 0.0, 3.999999999")); - Assert.assertTrue(out.contains("19: 0.0, 5.0") | out.contains("19: 0.0, 4.999999999")); - Assert.assertTrue(out.contains("20: 0.0, 6.0") | out.contains("20: 0.0, 5.999999999")); - Assert.assertTrue(out.contains("21: 0.0, 7.0") | out.contains("21: 0.0, 6.999999999")); - Assert.assertTrue(out.contains("22: 0.0, 8.0") | out.contains("22: 0.0, 7.999999999")); - Assert.assertTrue(out.contains("23: 0.0, 9.0") | out.contains("23: 0.0, 8.999999999")); - Assert.assertTrue(out.contains("24: 0.0, 10.0") | out.contains("24: 0.0, 9.999999999")); - Assert.assertTrue(out.contains("25: 0.0, 10.0") | out.contains("25: 0.0, 9.999999999")); - Assert.assertTrue(out.contains("26: 0.0, 10.0") | out.contains("26: 0.0, 9.999999999")); + Assert.assertTrue(out.contains("14: 0.0, 0.0") || out.contains("14: 0.0, -0.0")); + Assert.assertTrue(out.contains("15: 0.0, 1.0") || out.contains("15: 0.0, 0.999999999")); + Assert.assertTrue(out.contains("16: 0.0, 2.0") || out.contains("16: 0.0, 1.999999999")); + Assert.assertTrue(out.contains("17: 0.0, 3.0") || out.contains("17: 0.0, 2.999999999")); + Assert.assertTrue(out.contains("18: 0.0, 4.0") || out.contains("18: 0.0, 3.999999999")); + Assert.assertTrue(out.contains("19: 0.0, 5.0") || out.contains("19: 0.0, 4.999999999")); + Assert.assertTrue(out.contains("20: 0.0, 6.0") || out.contains("20: 0.0, 5.999999999")); + Assert.assertTrue(out.contains("21: 0.0, 7.0") || out.contains("21: 0.0, 6.999999999")); + Assert.assertTrue(out.contains("22: 0.0, 8.0") || out.contains("22: 0.0, 7.999999999")); + Assert.assertTrue(out.contains("23: 0.0, 9.0") || out.contains("23: 0.0, 8.999999999")); + Assert.assertTrue(out.contains("24: 0.0, 10.0") || out.contains("24: 0.0, 9.999999999")); + Assert.assertTrue(out.contains("25: 0.0, 10.0") || out.contains("25: 0.0, 9.999999999")); + Assert.assertTrue(out.contains("26: 0.0, 10.0") || out.contains("26: 0.0, 9.999999999")); } } } diff --git a/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestRadarTurnRateAndSetAdjust.java b/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestRadarTurnRateAndSetAdjust.java index f5b28bc..eab5801 100644 --- a/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestRadarTurnRateAndSetAdjust.java +++ b/代码/workspace_robo4/robocode.tests/src/test/java/net/sf/robocode/test/robots/TestRadarTurnRateAndSetAdjust.java @@ -40,20 +40,20 @@ public class TestRadarTurnRateAndSetAdjust extends RobocodeTestBed { if (event.getTurnSnapshot().getTurn() == 14) { final String out = buf.toString(); - Assert.assertTrue(out.contains("1: 45.0") | out.contains("1: 44.999999999")); - Assert.assertTrue(out.contains("2: 65.0") | out.contains("2: 64.999999999")); - Assert.assertTrue(out.contains("3: 75.0") | out.contains("3: 74.999999999")); - Assert.assertTrue(out.contains("4: -15.0") | out.contains("4: -14.999999999")); - Assert.assertTrue(out.contains("5: -55.0") | out.contains("5: -54.999999999")); - Assert.assertTrue(out.contains("6: -75.0") | out.contains("6: -74.999999999")); - Assert.assertTrue(out.contains("7: 32.0") | out.contains("7: 31.999999999")); - Assert.assertTrue(out.contains("8: 17.0") | out.contains("8: 16.999999999")); - Assert.assertTrue(out.contains("9: 35.0") | out.contains("9: 34.999999999")); - Assert.assertTrue(out.contains("10: 3.0") | out.contains("10: 2.999999999")); - Assert.assertTrue(out.contains("11: -21.0") | out.contains("11: -20.999999999")); - Assert.assertTrue(out.contains("12: 75.0") | out.contains("12: 74.999999999")); - Assert.assertTrue(out.contains("13: -75.0") | out.contains("13: -74.999999999")); - Assert.assertTrue(out.contains("14: -15.0") | out.contains("14: -14.999999999")); + Assert.assertTrue(out.contains("1: 45.0") || out.contains("1: 44.999999999")); + Assert.assertTrue(out.contains("2: 65.0") || out.contains("2: 64.999999999")); + Assert.assertTrue(out.contains("3: 75.0") || out.contains("3: 74.999999999")); + Assert.assertTrue(out.contains("4: -15.0") || out.contains("4: -14.999999999")); + Assert.assertTrue(out.contains("5: -55.0") || out.contains("5: -54.999999999")); + Assert.assertTrue(out.contains("6: -75.0") || out.contains("6: -74.999999999")); + Assert.assertTrue(out.contains("7: 32.0") || out.contains("7: 31.999999999")); + Assert.assertTrue(out.contains("8: 17.0") || out.contains("8: 16.999999999")); + Assert.assertTrue(out.contains("9: 35.0") || out.contains("9: 34.999999999")); + Assert.assertTrue(out.contains("10: 3.0") || out.contains("10: 2.999999999")); + Assert.assertTrue(out.contains("11: -21.0") || out.contains("11: -20.999999999")); + Assert.assertTrue(out.contains("12: 75.0") || out.contains("12: 74.999999999")); + Assert.assertTrue(out.contains("13: -75.0") || out.contains("13: -74.999999999")); + Assert.assertTrue(out.contains("14: -15.0") || out.contains("14: -14.999999999")); } } }