aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1EE_x_2s.html (renamed from tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1E_x_2s.html)0
-rw-r--r--tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a920951..f10c6b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-02-03 Jiri Vanek <[email protected]>
+
+ Another renamed conflict file for case insensitive systems
+ * tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1E_x_2s.html
+ Renamed to ParallelAppletsTest_1_x_2EE.html
+ * tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1EE_x_2s.html
+ new file.
+ * tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java:
+ (testParallelAppletsTest1Ex2s) adapted to renaming
+
2013-01-31 Jiri Vanek <[email protected]>
Renamed conflict file for case insensitive systems
diff --git a/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1E_x_2s.html b/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1EE_x_2s.html
index 33b92e7..33b92e7 100644
--- a/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1E_x_2s.html
+++ b/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1EE_x_2s.html
diff --git a/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java b/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java
index 059a26e..8f14897 100644
--- a/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java
+++ b/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java
@@ -50,7 +50,7 @@ public class ParallelAppletsTest extends BrowserTest {
@TestInBrowsers(testIn = {Browsers.one})
@NeedsDisplay
public void testParallelAppletsTest1Ex2s() throws Exception {
- ProcessResult pr = server.executeBrowser("ParallelAppletsTest_1E_x_2s.html");
+ ProcessResult pr = server.executeBrowser("ParallelAppletsTest_1EE_x_2s.html");
checkSimpleSignedStarted(pr);
checkNotInitialised(pr);
}