diff --git a/framework/core/Project/Cli.pm b/framework/core/Project/Cli.pm index d5ffb86ae..19fb7098a 100644 --- a/framework/core/Project/Cli.pm +++ b/framework/core/Project/Cli.pm @@ -83,6 +83,7 @@ sub determine_layout { # sub _post_checkout { my ($self, $rev_id, $work_dir) = @_; + my $vid = $self->{_vcs}->lookup_vid($rev_id); my $project_dir = "$PROJECTS_DIR/$self->{pid}"; # Check whether ant build file exists @@ -145,6 +146,22 @@ sub _post_checkout { print OUT $converted_file; close(OUT); } + + # Fix compilation errors if necessary. + # Run this as the first step to ensure that patches are applicable to + # unmodified source files. + my $compile_errors = "$PROJECTS_DIR/$self->{pid}/compile-errors/"; + opendir(DIR, $compile_errors) or die "Could not find compile-errors directory."; + my @entries = readdir(DIR); + closedir(DIR); + foreach my $file (@entries) { + if ($file =~ /-(\d+)-(\d+).diff/) { + if ($vid >= $1 && $vid <= $2) { + $self->apply_patch($work_dir, "$compile_errors/$file") + or confess("Couldn't apply patch ($file): $!"); + } + } + } } # diff --git a/framework/projects/Cli/compile-errors/test-13-16.diff b/framework/projects/Cli/compile-errors/test-13-16.diff new file mode 100644 index 000000000..a61fccdfe --- /dev/null +++ b/framework/projects/Cli/compile-errors/test-13-16.diff @@ -0,0 +1,33 @@ +diff --git a/src/test/org/apache/commons/cli2/jdepend/JDependTest.java b/src/test/org/apache/commons/cli2/jdepend/JDependTest.java +index f018642..1b3ff61 100644 +--- a/src/test/org/apache/commons/cli2/jdepend/JDependTest.java ++++ b/src/test/org/apache/commons/cli2/jdepend/JDependTest.java +@@ -65,7 +65,7 @@ public class JDependTest extends TestCase { + final String message = pkg.getName() + " too far from line: " + distance; + assertTrue( + message, +- distance < 0.21d); ++ distance < 0.26d); + } + } + +diff --git a/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java b/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java +index 707ef1e..a4fd007 100644 +--- a/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java ++++ b/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java +@@ -222,8 +222,8 @@ public class ClassValidatorTest extends TestCase { + resources.getMessage( + "ClassValidator.class.access", + className, +- "Class org.apache.commons.cli2.validation.ClassValidator " + +- "can not access a member of class " + ++ "class org.apache.commons.cli2.validation.ClassValidator " + ++ "cannot access a member of class " + + "org.apache.commons.cli2.validation.protect.ProtectedClass " + + "with modifiers \"protected\""), + ive.getMessage()); + + + + + diff --git a/framework/projects/Cli/compile-errors/test-21-21.diff b/framework/projects/Cli/compile-errors/test-21-21.diff new file mode 100644 index 000000000..a61fccdfe --- /dev/null +++ b/framework/projects/Cli/compile-errors/test-21-21.diff @@ -0,0 +1,33 @@ +diff --git a/src/test/org/apache/commons/cli2/jdepend/JDependTest.java b/src/test/org/apache/commons/cli2/jdepend/JDependTest.java +index f018642..1b3ff61 100644 +--- a/src/test/org/apache/commons/cli2/jdepend/JDependTest.java ++++ b/src/test/org/apache/commons/cli2/jdepend/JDependTest.java +@@ -65,7 +65,7 @@ public class JDependTest extends TestCase { + final String message = pkg.getName() + " too far from line: " + distance; + assertTrue( + message, +- distance < 0.21d); ++ distance < 0.26d); + } + } + +diff --git a/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java b/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java +index 707ef1e..a4fd007 100644 +--- a/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java ++++ b/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java +@@ -222,8 +222,8 @@ public class ClassValidatorTest extends TestCase { + resources.getMessage( + "ClassValidator.class.access", + className, +- "Class org.apache.commons.cli2.validation.ClassValidator " + +- "can not access a member of class " + ++ "class org.apache.commons.cli2.validation.ClassValidator " + ++ "cannot access a member of class " + + "org.apache.commons.cli2.validation.protect.ProtectedClass " + + "with modifiers \"protected\""), + ive.getMessage()); + + + + + diff --git a/framework/projects/Cli/compile-errors/test-7-7.diff b/framework/projects/Cli/compile-errors/test-7-7.diff new file mode 100644 index 000000000..a61fccdfe --- /dev/null +++ b/framework/projects/Cli/compile-errors/test-7-7.diff @@ -0,0 +1,33 @@ +diff --git a/src/test/org/apache/commons/cli2/jdepend/JDependTest.java b/src/test/org/apache/commons/cli2/jdepend/JDependTest.java +index f018642..1b3ff61 100644 +--- a/src/test/org/apache/commons/cli2/jdepend/JDependTest.java ++++ b/src/test/org/apache/commons/cli2/jdepend/JDependTest.java +@@ -65,7 +65,7 @@ public class JDependTest extends TestCase { + final String message = pkg.getName() + " too far from line: " + distance; + assertTrue( + message, +- distance < 0.21d); ++ distance < 0.26d); + } + } + +diff --git a/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java b/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java +index 707ef1e..a4fd007 100644 +--- a/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java ++++ b/src/test/org/apache/commons/cli2/validation/ClassValidatorTest.java +@@ -222,8 +222,8 @@ public class ClassValidatorTest extends TestCase { + resources.getMessage( + "ClassValidator.class.access", + className, +- "Class org.apache.commons.cli2.validation.ClassValidator " + +- "can not access a member of class " + ++ "class org.apache.commons.cli2.validation.ClassValidator " + ++ "cannot access a member of class " + + "org.apache.commons.cli2.validation.protect.ProtectedClass " + + "with modifiers \"protected\""), + ive.getMessage()); + + + + + diff --git a/framework/projects/JacksonDatabind/compile-errors/DateDeserialization-90-99.diff b/framework/projects/JacksonDatabind/compile-errors/DateDeserialization-90-99.diff deleted file mode 100644 index b2aaeb243..000000000 --- a/framework/projects/JacksonDatabind/compile-errors/DateDeserialization-90-99.diff +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/DateDeserializationTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/DateDeserializationTest.java -index 8a7a0b5ca..040679cda 100644 ---- a/src/test/java/com/fasterxml/jackson/databind/deser/DateDeserializationTest.java -+++ b/src/test/java/com/fasterxml/jackson/databind/deser/DateDeserializationTest.java -@@ -119,7 +119,7 @@ public class DateDeserializationTest - public void testDateUtilISO8601_DateTimeMillis() throws Exception - { - // WITH timezone (from 4 to 0 digits) -- failure(MAPPER, "2000-01-02T03:04:05.6789+01:00"); -+ //failure(MAPPER, "2000-01-02T03:04:05.6789+01:00"); - verify( MAPPER, "2000-01-02T03:04:05.678+01:00", judate(2000, 1, 2, 3, 4, 5, 678, "GMT+1")); - verify( MAPPER, "2000-01-02T03:04:05.67+01:00", judate(2000, 1, 2, 3, 4, 5, 670, "GMT+1")); - verify( MAPPER, "2000-01-02T03:04:05.6+01:00", judate(2000, 1, 2, 3, 4, 5, 600, "GMT+1")); -@@ -234,7 +234,7 @@ public class DateDeserializationTest - - // seconds (+01:00) - failure(MAPPER, "2000-01-02T03:04:5+01:00"); -- failure(MAPPER, "2000-01-02T03:04:5.000+01:00"); -+ //failure(MAPPER, "2000-01-02T03:04:5.000+01:00"); - failure(MAPPER, "2000-01-02T03:04:005+01:00"); - - // seconds (Z) -@@ -250,7 +250,7 @@ public class DateDeserializationTest - - // minutes (+01:00) - failure(MAPPER, "2000-01-02T03:4:05+01:00"); -- failure(MAPPER, "2000-01-02T03:4:05.000+01:00"); -+ //failure(MAPPER, "2000-01-02T03:4:05.000+01:00"); - failure(MAPPER, "2000-01-02T03:004:05+01:00"); - - // minutes (Z) -@@ -266,7 +266,7 @@ public class DateDeserializationTest - - // hour (+01:00) - failure(MAPPER, "2000-01-02T3:04:05+01:00"); -- failure(MAPPER, "2000-01-02T3:04:05.000+01:00"); -+ //failure(MAPPER, "2000-01-02T3:04:05.000+01:00"); - failure(MAPPER, "2000-01-02T003:04:05+01:00"); - - // hour (Z) diff --git a/framework/projects/JacksonDatabind/failing_tests/18dc249e793b15e40e67753ea5e988bd428b1a92 b/framework/projects/JacksonDatabind/failing_tests/18dc249e793b15e40e67753ea5e988bd428b1a92 index d63e61d58..63129a866 100644 --- a/framework/projects/JacksonDatabind/failing_tests/18dc249e793b15e40e67753ea5e988bd428b1a92 +++ b/framework/projects/JacksonDatabind/failing_tests/18dc249e793b15e40e67753ea5e988bd428b1a92 @@ -1,4 +1,6 @@ ## jackson-databind: 18dc249e793b15e40e67753ea5e988bd428b1a92 ## +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTimeMillis +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTime --- com.fasterxml.jackson.databind.BaseMapTest junit.framework.AssertionFailedError: Class com.fasterxml.jackson.databind.BaseMapTest has no public constructor TestCase(String name) or TestCase() at junit.framework.Assert.fail(Assert.java:57) diff --git a/framework/projects/JacksonDatabind/failing_tests/755e3bc0cbea30de0102f6a88519a0c34d571bbd b/framework/projects/JacksonDatabind/failing_tests/755e3bc0cbea30de0102f6a88519a0c34d571bbd index 307030c98..29fc49dc3 100644 --- a/framework/projects/JacksonDatabind/failing_tests/755e3bc0cbea30de0102f6a88519a0c34d571bbd +++ b/framework/projects/JacksonDatabind/failing_tests/755e3bc0cbea30de0102f6a88519a0c34d571bbd @@ -1,4 +1,6 @@ ## jackson-databind: 755e3bc0cbea30de0102f6a88519a0c34d571bbd ## +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTimeMillis +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTime --- com.fasterxml.jackson.databind.BaseMapTest junit.framework.AssertionFailedError: Class com.fasterxml.jackson.databind.BaseMapTest has no public constructor TestCase(String name) or TestCase() at junit.framework.Assert.fail(Assert.java:57) diff --git a/framework/projects/JacksonDatabind/failing_tests/a1404d5684783ccf28dc1b0a2791ce7c0c311907 b/framework/projects/JacksonDatabind/failing_tests/a1404d5684783ccf28dc1b0a2791ce7c0c311907 index ab3110619..acc764f80 100644 --- a/framework/projects/JacksonDatabind/failing_tests/a1404d5684783ccf28dc1b0a2791ce7c0c311907 +++ b/framework/projects/JacksonDatabind/failing_tests/a1404d5684783ccf28dc1b0a2791ce7c0c311907 @@ -1,4 +1,6 @@ ## jackson-databind: a1404d5684783ccf28dc1b0a2791ce7c0c311907 ## +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTimeMillis +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTime --- com.fasterxml.jackson.databind.BaseMapTest junit.framework.AssertionFailedError: Class com.fasterxml.jackson.databind.BaseMapTest has no public constructor TestCase(String name) or TestCase() at junit.framework.Assert.fail(Assert.java:57) diff --git a/framework/projects/JacksonDatabind/failing_tests/bc91126c55dc513735a2a95ace4c00a6021c76f4 b/framework/projects/JacksonDatabind/failing_tests/bc91126c55dc513735a2a95ace4c00a6021c76f4 index 57990ba39..d076f85c3 100644 --- a/framework/projects/JacksonDatabind/failing_tests/bc91126c55dc513735a2a95ace4c00a6021c76f4 +++ b/framework/projects/JacksonDatabind/failing_tests/bc91126c55dc513735a2a95ace4c00a6021c76f4 @@ -1,4 +1,6 @@ ## jackson-databind: bc91126c55dc513735a2a95ace4c00a6021c76f4 ## +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTimeMillis +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTime --- com.fasterxml.jackson.databind.BaseMapTest junit.framework.AssertionFailedError: Class com.fasterxml.jackson.databind.BaseMapTest has no public constructor TestCase(String name) or TestCase() at junit.framework.Assert.fail(Assert.java:57) diff --git a/framework/projects/JacksonDatabind/failing_tests/dfaca81ae7a82b7c3018f265815e98a5138118f7 b/framework/projects/JacksonDatabind/failing_tests/dfaca81ae7a82b7c3018f265815e98a5138118f7 index 8a079b17e..dd7d96704 100644 --- a/framework/projects/JacksonDatabind/failing_tests/dfaca81ae7a82b7c3018f265815e98a5138118f7 +++ b/framework/projects/JacksonDatabind/failing_tests/dfaca81ae7a82b7c3018f265815e98a5138118f7 @@ -1,4 +1,6 @@ ## jackson-databind: dfaca81ae7a82b7c3018f265815e98a5138118f7 ## +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTimeMillis +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTime --- com.fasterxml.jackson.databind.BaseMapTest junit.framework.AssertionFailedError: Class com.fasterxml.jackson.databind.BaseMapTest has no public constructor TestCase(String name) or TestCase() at junit.framework.Assert.fail(Assert.java:57) diff --git a/framework/projects/JacksonDatabind/failing_tests/f2c445d6d2de988531dcda25da81fda129bc53f2 b/framework/projects/JacksonDatabind/failing_tests/f2c445d6d2de988531dcda25da81fda129bc53f2 index b38bf95a6..404366282 100644 --- a/framework/projects/JacksonDatabind/failing_tests/f2c445d6d2de988531dcda25da81fda129bc53f2 +++ b/framework/projects/JacksonDatabind/failing_tests/f2c445d6d2de988531dcda25da81fda129bc53f2 @@ -1,4 +1,6 @@ ## jackson-databind: f2c445d6d2de988531dcda25da81fda129bc53f2 ## +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTimeMillis +--- com.fasterxml.jackson.databind.deser.DateDeserializationTest::testDateUtilISO8601_DateTime --- com.fasterxml.jackson.databind.BaseMapTest junit.framework.AssertionFailedError: Class com.fasterxml.jackson.databind.BaseMapTest has no public constructor TestCase(String name) or TestCase() at junit.framework.Assert.fail(Assert.java:57) diff --git a/framework/projects/Jsoup/failing_tests/65553582d184e18de10e496b0eaa53fbe206ba17 b/framework/projects/Jsoup/failing_tests/65553582d184e18de10e496b0eaa53fbe206ba17 new file mode 100644 index 000000000..ae86e46e8 --- /dev/null +++ b/framework/projects/Jsoup/failing_tests/65553582d184e18de10e496b0eaa53fbe206ba17 @@ -0,0 +1,3 @@ +## jsoup: 65553582d184e18de10e496b0eaa53fbe206ba17 ## +--- org.jsoup.helper.W3CDomTest::simpleConversion + diff --git a/framework/projects/Jsoup/failing_tests/a229d7354da5210a728ce5d43158d5cd780772db b/framework/projects/Jsoup/failing_tests/a229d7354da5210a728ce5d43158d5cd780772db new file mode 100644 index 000000000..bc6570698 --- /dev/null +++ b/framework/projects/Jsoup/failing_tests/a229d7354da5210a728ce5d43158d5cd780772db @@ -0,0 +1,3 @@ +## jsoup: a229d7354da5210a728ce5d43158d5cd780772db ## +--- org.jsoup.helper.W3CDomTest::simpleConversion + diff --git a/framework/projects/Lang/failing_tests/8e2f4ddb9a1ecd7a1bf7d752c2c891d630287036 b/framework/projects/Lang/failing_tests/8e2f4ddb9a1ecd7a1bf7d752c2c891d630287036 index 5989f1f3f..b80043982 100644 --- a/framework/projects/Lang/failing_tests/8e2f4ddb9a1ecd7a1bf7d752c2c891d630287036 +++ b/framework/projects/Lang/failing_tests/8e2f4ddb9a1ecd7a1bf7d752c2c891d630287036 @@ -1,4 +1,5 @@ ## commons-lang: 8e2f4ddb9a1ecd7a1bf7d752c2c891d630287036 ## +--- org.apache.commons.lang3.time.FastDateFormatTest::testShortDateStyleWithLocales --- org.apache.commons.lang3.builder.ToStringBuilderTest::testReflectionHierarchyArrayList junit.framework.ComparisonFailure: expected:<...770e40[elementData={[,,,,,,,,,]},size=0,modCount=0]> but was:<...770e40[elementData={[]},size=0,modCount=0]> at junit.framework.Assert.assertEquals(Assert.java:100) diff --git a/framework/projects/Time/failing_tests/3a413d7844c22dc6ddd50bf5d0d55ff3589e47ac b/framework/projects/Time/failing_tests/3a413d7844c22dc6ddd50bf5d0d55ff3589e47ac index 87a61e310..458679f16 100644 --- a/framework/projects/Time/failing_tests/3a413d7844c22dc6ddd50bf5d0d55ff3589e47ac +++ b/framework/projects/Time/failing_tests/3a413d7844c22dc6ddd50bf5d0d55ff3589e47ac @@ -1,3 +1,6 @@ +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textHalfdayAM_UK +--- org.joda.time.format.TestDateTimeFormat::testFormat_halfdayOfDay +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textEraBC_France --- org.joda.time.TestDateTimeZone::testGetName_berlin junit.framework.ComparisonFailure: expected:<[Central European Time]> but was:<[+01:00]> at junit.framework.Assert.assertEquals(Assert.java:100) diff --git a/framework/projects/Time/failing_tests/3ba9ba799b3261b7332a467a88be142c83b298fd b/framework/projects/Time/failing_tests/3ba9ba799b3261b7332a467a88be142c83b298fd index e17480c91..1c5ade419 100644 --- a/framework/projects/Time/failing_tests/3ba9ba799b3261b7332a467a88be142c83b298fd +++ b/framework/projects/Time/failing_tests/3ba9ba799b3261b7332a467a88be142c83b298fd @@ -1,3 +1,6 @@ +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textHalfdayAM_UK +--- org.joda.time.format.TestDateTimeFormat::testFormat_halfdayOfDay +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textEraBC_France --- org.joda.time.TestDateTimeZone::testGetName_berlin junit.framework.ComparisonFailure: expected:<[Central European Time]> but was:<[+01:00]> at junit.framework.Assert.assertEquals(Assert.java:100) diff --git a/framework/projects/Time/failing_tests/57c8aaf94b95323c295dcfec5f40f181846164e7 b/framework/projects/Time/failing_tests/57c8aaf94b95323c295dcfec5f40f181846164e7 index b2b596ff1..92e1aed80 100644 --- a/framework/projects/Time/failing_tests/57c8aaf94b95323c295dcfec5f40f181846164e7 +++ b/framework/projects/Time/failing_tests/57c8aaf94b95323c295dcfec5f40f181846164e7 @@ -1,3 +1,6 @@ +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textHalfdayAM_UK +--- org.joda.time.format.TestDateTimeFormat::testFormat_halfdayOfDay +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textEraBC_France --- org.joda.time.TestDateTimeZone::testGetShortName junit.framework.ComparisonFailure: expected:<[BST]> but was:<[+01:00]> at junit.framework.Assert.assertEquals(Assert.java:100) diff --git a/framework/projects/Time/failing_tests/57eb4cbb9044771cd46a9eee0c62016618930226 b/framework/projects/Time/failing_tests/57eb4cbb9044771cd46a9eee0c62016618930226 index 1a0c9992a..d91bf4f25 100644 --- a/framework/projects/Time/failing_tests/57eb4cbb9044771cd46a9eee0c62016618930226 +++ b/framework/projects/Time/failing_tests/57eb4cbb9044771cd46a9eee0c62016618930226 @@ -1,3 +1,6 @@ +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textHalfdayAM_UK +--- org.joda.time.format.TestDateTimeFormat::testFormat_halfdayOfDay +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textEraBC_France --- org.joda.time.TestDateTimeZone::testGetName_berlin junit.framework.ComparisonFailure: expected:<[Central European Time]> but was:<[+01:00]> at junit.framework.Assert.assertEquals(Assert.java:100) diff --git a/framework/projects/Time/failing_tests/5d08a1cdbfa6ce86a0baf637493c464e91e91968 b/framework/projects/Time/failing_tests/5d08a1cdbfa6ce86a0baf637493c464e91e91968 index 7d47d58ce..70b2df573 100644 --- a/framework/projects/Time/failing_tests/5d08a1cdbfa6ce86a0baf637493c464e91e91968 +++ b/framework/projects/Time/failing_tests/5d08a1cdbfa6ce86a0baf637493c464e91e91968 @@ -1,3 +1,6 @@ +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textHalfdayAM_UK +--- org.joda.time.format.TestDateTimeFormat::testFormat_halfdayOfDay +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textEraBC_France --- org.joda.time.TestDateTimeZone::testGetName_berlin junit.framework.ComparisonFailure: expected:<[Central European Time]> but was:<[+01:00]> at junit.framework.Assert.assertEquals(Assert.java:100) diff --git a/framework/projects/Time/failing_tests/77a6b3a44da7ae4af62e88b4b27eeefec2d768c2 b/framework/projects/Time/failing_tests/77a6b3a44da7ae4af62e88b4b27eeefec2d768c2 index f4bb4469d..a514027eb 100644 --- a/framework/projects/Time/failing_tests/77a6b3a44da7ae4af62e88b4b27eeefec2d768c2 +++ b/framework/projects/Time/failing_tests/77a6b3a44da7ae4af62e88b4b27eeefec2d768c2 @@ -1,3 +1,6 @@ +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textHalfdayAM_UK +--- org.joda.time.format.TestDateTimeFormat::testFormat_halfdayOfDay +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textEraBC_France --- org.joda.time.TestDateTimeZone::testGetName_berlin junit.framework.ComparisonFailure: expected:<[Central European Time]> but was:<[+01:00]> at junit.framework.Assert.assertEquals(Assert.java:100) diff --git a/framework/projects/Time/failing_tests/a6cb59ed2280ab0a32995fa8b5f1a7b0d47cb815 b/framework/projects/Time/failing_tests/a6cb59ed2280ab0a32995fa8b5f1a7b0d47cb815 index e17480c91..1c5ade419 100644 --- a/framework/projects/Time/failing_tests/a6cb59ed2280ab0a32995fa8b5f1a7b0d47cb815 +++ b/framework/projects/Time/failing_tests/a6cb59ed2280ab0a32995fa8b5f1a7b0d47cb815 @@ -1,3 +1,6 @@ +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textHalfdayAM_UK +--- org.joda.time.format.TestDateTimeFormat::testFormat_halfdayOfDay +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textEraBC_France --- org.joda.time.TestDateTimeZone::testGetName_berlin junit.framework.ComparisonFailure: expected:<[Central European Time]> but was:<[+01:00]> at junit.framework.Assert.assertEquals(Assert.java:100) diff --git a/framework/projects/Time/failing_tests/e0559c503f65641b9546c37e7c84c866caf37e66 b/framework/projects/Time/failing_tests/e0559c503f65641b9546c37e7c84c866caf37e66 index b2b596ff1..92e1aed80 100644 --- a/framework/projects/Time/failing_tests/e0559c503f65641b9546c37e7c84c866caf37e66 +++ b/framework/projects/Time/failing_tests/e0559c503f65641b9546c37e7c84c866caf37e66 @@ -1,3 +1,6 @@ +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textHalfdayAM_UK +--- org.joda.time.format.TestDateTimeFormat::testFormat_halfdayOfDay +--- org.joda.time.format.TestDateTimeFormat::testFormatParse_textEraBC_France --- org.joda.time.TestDateTimeZone::testGetShortName junit.framework.ComparisonFailure: expected:<[BST]> but was:<[+01:00]> at junit.framework.Assert.assertEquals(Assert.java:100)