Index: /FCKeditor.Java/branches/2.4/java-core/src/test/java/net/fckeditor/response/UploadResponseTest.java
===================================================================
--- /FCKeditor.Java/branches/2.4/java-core/src/test/java/net/fckeditor/response/UploadResponseTest.java	(revision 1967)
+++ /FCKeditor.Java/branches/2.4/java-core/src/test/java/net/fckeditor/response/UploadResponseTest.java	(revision 1967)
@@ -0,0 +1,74 @@
+package net.fckeditor.response;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import net.fckeditor.response.UploadResponse;
+
+public class UploadResponseTest {
+
+	@Test(expected = IllegalArgumentException.class)
+	public void noArguments() throws Exception {
+		new UploadResponse();
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void tooManyArguments() throws Exception {
+		new UploadResponse(101, "/some/url/file.txt", "file.txt",
+				"something's wrong", "arg no. 5");
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void notANumber() throws Exception {
+		new UploadResponse("1");
+	}
+
+	@Test
+	public void onlyErrorNumber() throws Exception {
+		UploadResponse actual = new UploadResponse(
+				UploadResponse.EN_INVALID_EXTENSION);
+		String expected = new String("<script type=\"text/javascript\">\n"
+				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
+				+ "window.parent.OnUploadCompleted(202);\n</script>");
+		assertEquals(expected, actual.toString());
+	}
+	
+	@Test
+	public void fourArguments() throws Exception {
+		UploadResponse actual = new UploadResponse(UploadResponse.EN_OK,"/fckeditor-java/userfiles/image/fredck.jpg");
+		String expected = new String("<script type=\"text/javascript\">\n"
+				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
+				+ "window.parent.OnUploadCompleted(0,'/fckeditor-java/userfiles/image/fredck.jpg');\n</script>");
+		assertEquals(expected, actual.toString());
+	}
+	
+	@Test
+	public void renamedFile() throws Exception {
+		UploadResponse actual = new UploadResponse(UploadResponse.EN_RENAMED,"/fckeditor-java/userfiles/image/hacked_php.txt","hacked_php.txt");
+		String expected = new String("<script type=\"text/javascript\">\n"
+				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
+				+ "window.parent.OnUploadCompleted(201,'/fckeditor-java/userfiles/image/hacked_php.txt','hacked_php.txt');\n</script>");
+		assertEquals(expected, actual.toString());
+	}
+
+	@Test
+	public void customMessage() throws Exception {
+		UploadResponse actual = new UploadResponse(UploadResponse.EN_ERROR);
+		actual.setCustomMessage("some error");
+		String expected = new String("<script type=\"text/javascript\">\n"
+				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
+				+ "window.parent.OnUploadCompleted(1,'','','some error');\n</script>");
+		assertEquals(expected, actual.toString());
+	}
+
+
+	@Test
+	public void nullArguments() throws Exception {
+		UploadResponse actual = new UploadResponse(UploadResponse.EN_ERROR,null,null,null);
+		String expected = new String("<script type=\"text/javascript\">\n"
+				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
+				+ "window.parent.OnUploadCompleted(1,'','','');\n</script>");
+		assertEquals(expected, actual.toString());
+	}
+
+}
Index: Keditor.Java/branches/2.4/java-core/src/test/java/net/fckeditor/tool/UploadResponseTest.java
===================================================================
--- /FCKeditor.Java/branches/2.4/java-core/src/test/java/net/fckeditor/tool/UploadResponseTest.java	(revision 1966)
+++ 	(revision )
@@ -1,74 +1,0 @@
-package net.fckeditor.tool;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import net.fckeditor.response.UploadResponse;
-
-public class UploadResponseTest {
-
-	@Test(expected = IllegalArgumentException.class)
-	public void noArguments() throws Exception {
-		new UploadResponse();
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void tooManyArguments() throws Exception {
-		new UploadResponse(101, "/some/url/file.txt", "file.txt",
-				"something's wrong", "arg no. 5");
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void notANumber() throws Exception {
-		new UploadResponse("1");
-	}
-
-	@Test
-	public void onlyErrorNumber() throws Exception {
-		UploadResponse actual = new UploadResponse(
-				UploadResponse.EN_INVALID_EXTENSION);
-		String expected = new String("<script type=\"text/javascript\">\n"
-				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-				+ "window.parent.OnUploadCompleted(202);\n</script>");
-		assertEquals(expected, actual.toString());
-	}
-	
-	@Test
-	public void fourArguments() throws Exception {
-		UploadResponse actual = new UploadResponse(UploadResponse.EN_OK,"/fckeditor-java/userfiles/image/fredck.jpg");
-		String expected = new String("<script type=\"text/javascript\">\n"
-				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-				+ "window.parent.OnUploadCompleted(0,'/fckeditor-java/userfiles/image/fredck.jpg');\n</script>");
-		assertEquals(expected, actual.toString());
-	}
-	
-	@Test
-	public void renamedFile() throws Exception {
-		UploadResponse actual = new UploadResponse(UploadResponse.EN_RENAMED,"/fckeditor-java/userfiles/image/hacked_php.txt","hacked_php.txt");
-		String expected = new String("<script type=\"text/javascript\">\n"
-				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-				+ "window.parent.OnUploadCompleted(201,'/fckeditor-java/userfiles/image/hacked_php.txt','hacked_php.txt');\n</script>");
-		assertEquals(expected, actual.toString());
-	}
-
-	@Test
-	public void customMessage() throws Exception {
-		UploadResponse actual = new UploadResponse(UploadResponse.EN_ERROR);
-		actual.setCustomMessage("some error");
-		String expected = new String("<script type=\"text/javascript\">\n"
-				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-				+ "window.parent.OnUploadCompleted(1,'','','some error');\n</script>");
-		assertEquals(expected, actual.toString());
-	}
-
-
-	@Test
-	public void nullArguments() throws Exception {
-		UploadResponse actual = new UploadResponse(UploadResponse.EN_ERROR,null,null,null);
-		String expected = new String("<script type=\"text/javascript\">\n"
-				+ "(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-				+ "window.parent.OnUploadCompleted(1,'','','');\n</script>");
-		assertEquals(expected, actual.toString());
-	}
-
-}