Many bugfixes and improvements

This commit is contained in:
Ziver Koc 2011-06-24 23:20:59 +00:00
parent c3e3bbf787
commit 363e0c6cfc
52 changed files with 2021 additions and 982 deletions

View file

@ -0,0 +1,51 @@
package zutil.test;
import static org.junit.Assert.*;
import java.io.IOException;
import org.junit.Test;
import zutil.io.BoundaryBufferedInputStream;
import zutil.io.StringInputStream;
public class BoundaryBufferedInputStreamTest {
@Test
public void testReadB1() throws IOException {
StringInputStream inin = new StringInputStream();
BoundaryBufferedInputStream in = new BoundaryBufferedInputStream(inin);
inin.add("aaa#aaaaaaaaaaaaaaaa#aaaaaaaaaaaaaaa#");
in.setBoundary("#");
int n = 0;
for(n=0; in.read() != -1 ;n++);
assertEquals(3, n);
in.next();
n = 0;
for(n=0; in.read() != -1 ;n++);
assertEquals(16, n);
in.next();
n = 0;
for(n=0; in.read() != -1 ;n++);
assertEquals(15, n);
in.next();
assertEquals(-1, in.read());
}
@Test
public void testReadByteArray() {
fail("Not yet implemented");
}
@Test
public void testReadByteArrayIntInt() {
fail("Not yet implemented");
}
}

View file

@ -0,0 +1,46 @@
package zutil.test;
import static org.junit.Assert.*;
import org.junit.Test;
import zutil.converters.Converter;
public class ConverterTest {
@Test
public void testHexToByte() {
assertEquals( (byte)1, Converter.hexToByte('1') );
assertEquals( (byte)5, Converter.hexToByte('5') );
assertEquals( (byte)10, Converter.hexToByte('A') );
assertEquals( (byte)10, Converter.hexToByte('a') );
}
@Test
public void testHexToByte2() {
assertEquals( 0x00, Converter.hexToByte('0','0') );
assertEquals( 0x11, Converter.hexToByte('1','1') );
assertEquals( 0x75, Converter.hexToByte('7','5') );
assertEquals( 0xDA, Converter.hexToByte('D','A') );
assertEquals( 0xFA, Converter.hexToByte('F','a') );
assertEquals( 0xFF, Converter.hexToByte('f','f') );
}
@Test
public void testUrlEncode() {
assertEquals( "fas8dg7%20a0d1%2313f9g8d7%200h9a%a4%25h0",
Converter.urlEncode("fas8dg7 a0d1#13f9g8d7 0h9a¤%h0") );
assertEquals( "9i34%e5%202y92%a452%25%2623%20463765%a4(%2f%26(",
Converter.urlEncode("9i34å 2y92¤52%&23 463765¤(/&(") );
}
@Test
public void testUrlDecode() {
assertEquals( "fas8dg7 a0d1#13f9g8d7 0h9a%h0",
Converter.urlDecode("fas8dg7%20a0d1%2313f9g8d7%200h9a%25h0") );
assertEquals( "9i34å 2y9252%&23 463765(/&(",
Converter.urlDecode("9i34%e5%202y9252%25%2623%20463765(%2f%26(") );
}
}

View file

@ -0,0 +1,37 @@
package zutil.test;
import java.sql.PreparedStatement;
import zutil.db.DBConnection;
import zutil.db.handler.SimpleSQLHandler;
public class DBConnectionTest {
public static void main(String[] args){
try {
DBConnection db = new DBConnection("koc.se","db","user","password");
// Query 1
PreparedStatement sql = db.getPreparedStatement("SELECT ?");
sql.setInt(1, 1);
DBConnection.exec(sql);
// Query 2
db.exec("UPDATE ...");
// Query 3
String s = db.exec("SELECT hello", new SimpleSQLHandler<String>());
System.out.println( s );
// Query 4
PreparedStatement sql2 = db.getPreparedStatement("SELECT ?");
sql2.setString(1, "hello");
String s2 = DBConnection.exec(sql2, new SimpleSQLHandler<String>());
System.out.println( s2 );
db.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}

View file

@ -0,0 +1,48 @@
package zutil.test;
import static org.junit.Assert.*;
import org.junit.Test;
import zutil.net.http.HttpURL;
public class HttpURLTest {
@Test
public void fullURLTest() {
HttpURL url = new HttpURL();
url.setProtocol("http");
assertEquals( "http://127.0.0.1/", url.getURL() );
url.setHost("koc.se");
assertEquals( "http://koc.se/", url.getURL() );
url.setPort( 80 );
assertEquals( "http://koc.se:80/", url.getURL() );
url.setPath("test/index.html");
assertEquals( "http://koc.se:80/test/index.html", url.getURL() );
url.setParameter("key", "value");
assertEquals( "http://koc.se:80/test/index.html?key=value", url.getURL() );
url.setAnchor( "anch" );
assertEquals( "http://koc.se:80/test/index.html?key=value#anch", url.getURL() );
}
@Test
public void urlParameterTest() {
HttpURL url = new HttpURL();
url.setParameter("key1", "value1");
assertEquals( "key1=value1", url.getParameterString() );
url.setParameter("key1", "value1");
assertEquals( "key1=value1", url.getParameterString() );
url.setParameter("key2", "value2");
assertEquals( "key2=value2&key1=value1", url.getParameterString() );
}
}

View file

@ -0,0 +1,96 @@
package zutil.test;
import org.junit.*;
import static org.junit.Assert.*;
import zutil.db.SQLQuery;
public class SQLQueryTest {
@Test
public void selectTest() {
assertEquals( "SELECT * FROM test1",
""+SQLQuery.SELECT().FROM("test1") );
assertEquals( "SELECT * FROM test1",
""+SQLQuery.SELECT("*").FROM("test1") );
assertEquals( "SELECT test1,test2 FROM test1",
""+SQLQuery.SELECT("test1","test2").FROM("test1") );
}
@Test
public void selectJoinTest() {
assertEquals( "SELECT * FROM test1 JOIN test2",
""+SQLQuery.SELECT("*").FROM("test1").JOIN("test2") );
assertEquals( "SELECT * FROM test1 NATURAL JOIN test2",
""+SQLQuery.SELECT("*").FROM("test1").NATURAL_JOIN("test2") );
assertEquals( "SELECT * FROM test1 UNION test2",
""+SQLQuery.SELECT("*").FROM("test1").UNION("test2") );
assertEquals( "SELECT * FROM test1 JOIN test2 NATURAL JOIN test3 UNION test4",
""+SQLQuery.SELECT("*").FROM("test1").JOIN("test2").NATURAL_JOIN("test3").UNION("test4") );
assertEquals( "SELECT * FROM test1 NATURAL JOIN test2 NATURAL JOIN test3 NATURAL JOIN test4",
""+SQLQuery.SELECT("*").FROM().NATURAL_JOIN("test1","test2","test3","test4") );
assertEquals( "SELECT * FROM test1 JOIN test2 JOIN test3 JOIN test4",
""+SQLQuery.SELECT("*").FROM().JOIN("test1","test2","test3","test4") );
assertEquals( "SELECT * FROM test1 UNION test2 UNION test3 UNION test4",
""+SQLQuery.SELECT("*").FROM().UNION("test1","test2","test3","test4") );
}
@Test
public void selectWhereTest() {
assertEquals( "SELECT * FROM test1 WHERE arg=value",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value") );
}
@Test
public void selectGroupByTest() {
assertEquals( "SELECT * FROM test1 GROUP BY col1",
""+SQLQuery.SELECT("*").FROM("test1").GROUP_BY("col1") );
assertEquals( "SELECT * FROM test1 WHERE arg=value GROUP BY col1",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").GROUP_BY("col1") );
assertEquals( "SELECT * FROM test1 WHERE arg=value GROUP BY col1 ASC",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").GROUP_BY("col1").ASC() );
assertEquals( "SELECT * FROM test1 WHERE arg=value GROUP BY col1 DESC",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").GROUP_BY("col1").DESC() );
}
@Test
public void selectOrderByTest() {
assertEquals( "SELECT * FROM test1 WHERE arg=value ORDER BY col1",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").ORDER_BY("col1") );
assertEquals( "SELECT * FROM test1 WHERE arg=value ORDER BY col1 ASC",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").ORDER_BY("col1").ASC() );
assertEquals( "SELECT * FROM test1 WHERE arg=value ORDER BY col1 DESC",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").ORDER_BY("col1").DESC() );
assertEquals( "SELECT * FROM test1 WHERE arg=value GROUP BY col1 ORDER BY col2 DESC",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").GROUP_BY("col1").ORDER_BY("col2").DESC() );
assertEquals( "SELECT * FROM test1 WHERE arg=value GROUP BY col1 ASC ORDER BY col2 DESC",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").GROUP_BY("col1").ASC().ORDER_BY("col2").DESC() );
}
@Test
public void selectLimitTest() {
assertEquals( "SELECT * FROM test1 LIMIT 1",
""+SQLQuery.SELECT("*").FROM("test1").LIMIT(1) );
assertEquals( "SELECT * FROM test1 LIMIT 1 4",
""+SQLQuery.SELECT("*").FROM("test1").LIMIT(1).TO(4) );
assertEquals( "SELECT * FROM test1 WHERE arg=value LIMIT 1",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").LIMIT(1) );
assertEquals( "SELECT * FROM test1 WHERE arg=value ORDER BY col1 DESC LIMIT 1",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").ORDER_BY("col1").DESC().LIMIT(1) );
assertEquals( "SELECT * FROM test1 WHERE arg=value GROUP BY col1 ORDER BY col2 DESC LIMIT 1",
""+SQLQuery.SELECT("*").FROM("test1").WHERE().EQ("arg","value").GROUP_BY("col1").ORDER_BY("col2").DESC().LIMIT(1) );
}
@Test
public void updateTest() {
}
@Test
public void deleteTest() {
}
@Test
public void createTest() {
}
}

View file

@ -1,20 +1,43 @@
package zutil.test;
import zutil.ProgressListener;
import zutil.net.UpdateClient;
import zutil.net.Zupdater;
import java.awt.EventQueue;
import java.util.logging.Level;
public class UpdateClientTest implements ProgressListener{
import zutil.ProgressListener;
import zutil.log.CompactLogFormatter;
import zutil.log.LogUtil;
import zutil.net.update.FileInfo;
import zutil.net.update.UpdateClient;
import zutil.net.update.Zupdater;
public class UpdateClientTest implements ProgressListener<UpdateClient, FileInfo>{
public static void main(String[] args){
LogUtil.setLevel("zutil", Level.FINEST);
LogUtil.setFormatter("zutil", new CompactLogFormatter());
UpdateClientTest client = new UpdateClientTest();
client.start();
}
public void start(){
try {
UpdateClient client = new UpdateClient("localhost", 2000, "client");
final UpdateClient client = new UpdateClient("localhost", 2000, "C:\\Users\\Ziver\\Desktop\\client");
client.setProgressListener(new Zupdater());
//client.setProgressListener(this);
EventQueue.invokeLater(new Runnable() {
public void run() {
try {
Zupdater gui = new Zupdater();
client.setProgressListener(gui);
gui.setVisible(true);
} catch (Exception e) {
e.printStackTrace();
}
}
});
client.update();
client.close();
} catch (Exception e) {
@ -22,7 +45,7 @@ public class UpdateClientTest implements ProgressListener{
}
}
public void progressUpdate(Object source, Object info, double percent) {
public void progressUpdate(UpdateClient source, FileInfo info, double percent) {
System.out.println(info+": "+percent+"%");
}
}

View file

@ -1,11 +1,18 @@
package zutil.test;
import zutil.net.UpdateServer;
import java.util.logging.Level;
import zutil.log.CompactLogFormatter;
import zutil.log.LogUtil;
import zutil.net.update.UpdateServer;
public class UpdateServerTest {
public static void main(String[] args){
try {
new UpdateServer(2000, "server");
LogUtil.setGlobalLevel(Level.FINEST);
LogUtil.setGlobalFormatter(new CompactLogFormatter());
new UpdateServer(2000, "C:\\Users\\Ziver\\Desktop\\server");
}catch (Exception e) {
e.printStackTrace();
}