Revision: 7846
http://languagetool.svn.sourceforge.net/languagetool/?rev=7846&view=rev
Author: dnaber
Date: 2012-08-12 14:27:04 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
speed up "ant test" by not running tests more often than needed
Modified Paths:
--------------
trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerLoadTest.java
trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerTest.java
Modified:
trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerLoadTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerLoadTest.java
2012-08-12 14:12:30 UTC (rev 7845)
+++
trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerLoadTest.java
2012-08-12 14:27:04 UTC (rev 7846)
@@ -1,5 +1,7 @@
package org.languagetool.server;
+import org.junit.Test;
+
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -12,9 +14,10 @@
public class HTTPServerLoadTest extends HTTPServerTest {
// we keep these numbers low so "ant test" stays fast - increase them for
serious testing:
- private static final int REPEAT_COUNT = 2;
+ private static final int REPEAT_COUNT = 1;
private static final int THREAD_COUNT = 2;
+ @Test
@Override
public void testHTTPServer() throws Exception {
final long startTime = System.currentTimeMillis();
Modified:
trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerTest.java
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerTest.java
2012-08-12 14:12:30 UTC (rev 7845)
+++ trunk/JLanguageTool/src/test/org/languagetool/server/HTTPServerTest.java
2012-08-12 14:27:04 UTC (rev 7846)
@@ -28,16 +28,22 @@
import javax.xml.parsers.ParserConfigurationException;
-import junit.framework.TestCase;
-
+import org.junit.Ignore;
+import org.junit.Test;
import org.languagetool.JLanguageTool;
import org.languagetool.Language;
import org.languagetool.XMLValidator;
import org.languagetool.tools.StringTools;
import org.xml.sax.SAXException;
-public class HTTPServerTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+public class HTTPServerTest {
+
+ @Ignore("already gets tested by HTTPServerLoadTest")
+ @Test
public void testHTTPServer() throws Exception {
final HTTPServer server = new HTTPServer();
try {
@@ -142,6 +148,7 @@
}
+ @Test
public void testAccessDenied() throws Exception {
final HTTPServer server = new HTTPServer(HTTPServer.DEFAULT_PORT, false,
false, new HashSet<String>());
try {
@@ -226,14 +233,14 @@
wr.close();
}
}
-
+
private static String join(String[] s, String delimiter) {
- if (s == null || s.length == 0 ) return "";
- StringBuilder builder = new StringBuilder(s[0]);
- for (int i = 1; i < s.length; i++) {
- builder.append(delimiter).append(s[i]);
- }
- return builder.toString();
- }
+ if (s == null || s.length == 0 ) return "";
+ final StringBuilder builder = new StringBuilder(s[0]);
+ for (int i = 1; i < s.length; i++) {
+ builder.append(delimiter).append(s[i]);
+ }
+ return builder.toString();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
Languagetool-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
