Renamed conflict file for case insensitive systems

3 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ae6f558..a920951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-31  Jiri Vanek  <[email protected]>
+
+	Renamed conflict file for case insensitive systems
+	* tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1_x_2E.html:
+	Renamed to  ParallelAppletsTest_1_x_2EE.html
+	* tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1_x_2EE.html:
+	new file.
+	* tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java:
+	(testParallelAppletsTest1x2E) adapted to renaming
+
 2013-01-30  Jiri Vanek  <[email protected]>
 
 	Add unit tests for locales and locales fixed
diff --git a/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1_x_2E.html b/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1_x_2EE.html
index 80dda2f..80dda2f 100644
--- a/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1_x_2E.html
+++ b/tests/reproducers/simple/CountingApplet1/resources/ParallelAppletsTest_1_x_2EE.html
diff --git a/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java b/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java
index 2087e05..059a26e 100644
--- a/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java
+++ b/tests/reproducers/simple/CountingApplet1/testcases/ParallelAppletsTest.java
@@ -59,7 +59,7 @@ public class ParallelAppletsTest extends BrowserTest {
     @TestInBrowsers(testIn = {Browsers.one})
     @NeedsDisplay
     public void testParallelAppletsTest1x2E() throws Exception {
-        ProcessResult pr = server.executeBrowser("ParallelAppletsTest_1_x_2E.html");
+        ProcessResult pr = server.executeBrowser("ParallelAppletsTest_1_x_2EE.html");
         checkExactCounts(1, 10, pr);
         checkNotInitialised(pr);