Changed folder structure of test classes and renamed some packages

.gitignore

@@ -1 +1,2 @@
+Zutil.jar
 /build/

src/zutil/Hasher.java

@@ -24,7 +24,7 @@
 
 package zutil;
 
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 
 import javax.crypto.Mac;
 import javax.crypto.SecretKeyFactory;

src/zutil/StringUtil.java

@@ -24,7 +24,7 @@
 
 package zutil;
 
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 
 import java.util.ArrayList;
 import java.util.Iterator;

src/zutil/converter/Converter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.converters;
+package zutil.converter;
 
 import zutil.io.DynamicByteArrayStream;
 import zutil.parser.Base64Decoder;

src/zutil/converter/ConverterTest.java

@@ -22,14 +22,15 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.converter;
 
 import org.junit.Test;
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
+
 public class ConverterTest {
 
 	@Test

src/zutil/converter/NumberToWordsConverter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.converters;
+package zutil.converter;
 
 import java.util.HashMap;
 

src/zutil/converter/NumberToWordsConverterTest.java

@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.converter;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import zutil.converters.NumberToWordsConverter;
+import zutil.converter.NumberToWordsConverter;
 
 import java.util.Arrays;
 import java.util.Collection;

src/zutil/converter/WGS84Converter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.converters;
+package zutil.converter;
 
 public class WGS84Converter {
 	public static void main(String[] args){

src/zutil/db/DBQueue.java

@@ -24,7 +24,7 @@
 
 package zutil.db;
 
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 import zutil.io.MultiPrintStream;
 
 import java.sql.PreparedStatement;

src/zutil/image/filter/BlurFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;

src/zutil/image/filter/ColorIntensityFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import zutil.image.ImageFilterProcessor;
 import zutil.math.ZMath;

src/zutil/image/filter/ContrastBrightnessFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;

src/zutil/image/filter/ConvolutionFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;

src/zutil/image/filter/DitheringFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;

src/zutil/image/filter/GaussianBlurFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import java.awt.image.BufferedImage;
 

src/zutil/image/filter/MeanBlurFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import java.awt.image.BufferedImage;
 

src/zutil/image/filter/MedianFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import zutil.algo.sort.sortable.SortableDataList;
 import zutil.image.ImageFilterProcessor;

src/zutil/image/filter/ResizeImage.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import zutil.image.ImageFilterProcessor;
 import zutil.math.ZMath;

src/zutil/image/filter/SobelEdgeDetectionFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import zutil.image.ImageFilterProcessor;
 import zutil.math.ZMath;

src/zutil/image/filter/SpotLightFilter.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.image.filters;
+package zutil.image.filter;
 
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;

src/zutil/net/http/HttpHeader.java

@@ -24,7 +24,7 @@
 
 package zutil.net.http;
 
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 
 import java.util.HashMap;
 import java.util.Iterator;

src/zutil/net/http/HttpPrintStream.java

@@ -24,7 +24,7 @@
 
 package zutil.net.http;
 
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/zutil/net/http/page/HttpFilePage.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.net.http.pages;
+package zutil.net.http.page;
 
 import zutil.io.IOUtil;
 import zutil.io.file.FileUtil;

src/zutil/net/nio/NioNetwork.java

@@ -25,7 +25,7 @@
 package zutil.net.nio;
 
 import zutil.Encrypter;
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 import zutil.io.DynamicByteArrayStream;
 import zutil.io.MultiPrintStream;
 import zutil.log.LogUtil;

src/zutil/net/upnp/service/BrowseRetObj.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.net.upnp.services;
+package zutil.net.upnp.service;
 
 import zutil.net.ws.WSReturnObject;
 

src/zutil/net/upnp/service/UPnPContentDirectory.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.net.upnp.services;
+package zutil.net.upnp.service;
 
 import org.dom4j.DocumentException;
 import zutil.io.file.FileUtil;

src/zutil/net/ws/rest/RestHttpPage.java

@@ -24,7 +24,7 @@
 
 package zutil.net.ws.rest;
 
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 import zutil.io.StringOutputStream;
 import zutil.net.http.HttpHeader;
 import zutil.net.http.HttpPage;

src/zutil/net/ws/soap/SOAPHttpPage.java

@@ -31,7 +31,7 @@ import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 import org.xml.sax.SAXException;
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 import zutil.log.LogUtil;
 import zutil.net.http.HttpHeader;
 import zutil.net.http.HttpPage;

src/zutil/parser/Base64Decoder.java

@@ -24,7 +24,7 @@
 
 package zutil.parser;
 
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 import zutil.io.DynamicByteArrayStream;
 
 public class Base64Decoder {

src/zutil/parser/URLDecoder.java

@@ -24,7 +24,7 @@
 
 package zutil.parser;
 
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 
 import java.io.UnsupportedEncodingException;
 

src/zutil/parser/binary/BinaryStructParser.java

@@ -25,7 +25,7 @@
 package zutil.parser.binary;
 
 import zutil.ByteUtil;
-import zutil.converters.Converter;
+import zutil.converter.Converter;
 import zutil.parser.binary.BinaryStruct.BinaryField;
 
 import java.lang.reflect.Field;

src/zutil/ui/wizard/page/SummaryPage.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.ui.wizard.pages;
+package zutil.ui.wizard.page;
 
 import zutil.ui.wizard.WizardPage;
 

test/zutil/ByteUtilTest.java

@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil;
 
 import org.junit.Test;
-import zutil.ByteUtil;
 
 import static org.junit.Assert.assertEquals;
 
+
 /**
  * Created by Ziver on 2016-01-31.
  */

test/zutil/EncrypterTest.java

@@ -22,14 +22,14 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil;
 
 import org.junit.Test;
-import zutil.Encrypter;
 import zutil.Encrypter.Algorithm;
 
 import static org.junit.Assert.assertEquals;
 
+
 public class EncrypterTest {
 	public static final String data = "Hello there, wats yor name, my is a secret, 123456789";
     public static final String key = "abcdefghijklmnopqrstuvwxyz";

test/zutil/HasherTest.java

@@ -22,10 +22,9 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil;
 
 import org.junit.Test;
-import zutil.Hasher;
 
 import static org.junit.Assert.assertEquals;
 

test/zutil/StringUtilTest.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil;
 
 import org.junit.Test;
 import zutil.StringUtil;
@@ -31,6 +31,7 @@ import java.util.Arrays;
 
 import static org.junit.Assert.assertEquals;
 
+
 public class StringUtilTest {
 
 	@Test

test/zutil/algo/search/QuickSelectTest.java

@@ -22,13 +22,16 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.algo.search;
 
-import zutil.algo.search.QuickSelect;
 import zutil.algo.sort.sortable.SortableIntArray;
 
 import java.util.Arrays;
 
+
+/**
+ * TODO: Convert to JUnit
+ */
 public class QuickSelectTest {
 	public static void main(String[] args){
 		int[] array = {1,3,4,6,3,2,98,5,7,8,543,2,4,5,8,9,5,2,3,5,7,5,3,2,6,8,5,324,8,6};

test/zutil/algo/sort/ExternalSortTest.java

@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
-
-import zutil.algo.sort.ExternalSort;
+package zutil.algo.sort;
 
 import java.io.File;
 

test/zutil/algo/sort/MergeSortTest.java

@@ -22,13 +22,14 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.algo.sort;
 
 import zutil.algo.sort.MergeSort;
 import zutil.algo.sort.sortable.SortableIntArray;
 
+// TODO: Convert to JUnit
 @SuppressWarnings("unused")
-public class SortTestSimple {
+public class MergeSortTest {
 	public static final int SIZE = 10000;
 	public static final int MAX_INT = 10000;
 

test/zutil/chart/ChartTest.java

@@ -22,15 +22,14 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.chart;
 
-import zutil.chart.ChartData;
-import zutil.chart.LineChart;
 import zutil.log.LogUtil;
 
 import javax.swing.*;
 import java.util.logging.Level;
 
+
 public class ChartTest extends JFrame{
 	private static final long serialVersionUID = 1L;
 

test/zutil/db/DBConnectionTest.java

@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.db;
 
-import zutil.db.DBConnection;
 import zutil.db.handler.SimpleSQLResult;
 
 import java.sql.PreparedStatement;
 
+
 public class DBConnectionTest {
 
 	public static void main(String[] args){

test/zutil/db/SQLQueryTest.java

@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.db;
 
 import org.junit.Test;
-import zutil.db.SQLQuery;
 
 import static org.junit.Assert.assertEquals;
 
+
 public class SQLQueryTest {
 
 	@Test

test/zutil/image/ImageProcessorTest.java

@@ -22,11 +22,10 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.image;
 
 import zutil.ProgressListener;
-import zutil.image.ImageFilterProcessor;
-import zutil.image.filters.GaussianBlurFilter;
+import zutil.image.filter.GaussianBlurFilter;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
@@ -39,6 +38,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+
 @SuppressWarnings({ "unused", "rawtypes" })
 public class ImageProcessorTest implements ProgressListener{
 	private static String imgPath = "test.gif";

test/zutil/io/BoundaryBufferedInputStreamTest.java

@@ -22,16 +22,15 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.io;
 
 import org.junit.Test;
-import zutil.io.BoundaryBufferedInputStream;
-import zutil.io.StringInputStream;
 
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
 
+
 @SuppressWarnings("resource")
 public class BoundaryBufferedInputStreamTest {
 

test/zutil/io/DynamicByteArrayStreamTest.java

@@ -22,14 +22,14 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.io;
 
 import org.junit.Test;
-import zutil.io.DynamicByteArrayStream;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+
 /**
  * User: Ziver
  */

test/zutil/io/file/FileChangedTest.java

@@ -22,16 +22,13 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
-
-import zutil.io.file.FileChangeListener;
-import zutil.io.file.FileUtil;
-import zutil.io.file.FileWatcher;
+package zutil.io.file;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.net.URISyntaxException;
 
+
 public class FileChangedTest implements FileChangeListener{
 	public static void main(String[] args) throws URISyntaxException, FileNotFoundException{
 		FileWatcher watcher = new FileWatcher(FileUtil.find("test.txt"));

test/zutil/log/net/NetLogServerTest.java

@@ -22,14 +22,14 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.log.net;
 
 import zutil.log.LogUtil;
-import zutil.log.net.NetLogServer;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+
 public class NetLogServerTest {
 	private static final Logger logger = LogUtil.getLogger();
 

test/zutil/net/ServerFindClientTest.java

@@ -22,12 +22,13 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net;
 
 import zutil.net.ServerFindClient;
 
 import java.io.IOException;
 
+
 public class ServerFindClientTest {
 	public static void main(String[] args){
 		try {

test/zutil/net/ServerFindServerTest.java

@@ -22,12 +22,11 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
-
-import zutil.net.ServerFind;
+package zutil.net;
 
 import java.io.IOException;
 
+
 public class ServerFindServerTest {
 	public static void main(String[] args){
 		try {

test/zutil/net/http/HTTPGuessTheNumber.java

@@ -22,12 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
-
-import zutil.net.http.HttpHeader;
-import zutil.net.http.HttpPage;
-import zutil.net.http.HttpPrintStream;
-import zutil.net.http.HttpServer;
+package zutil.net.http;
 
 import java.io.IOException;
 import java.util.Map;

test/zutil/net/http/HTTPUploaderTest.java

@@ -22,12 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
-
-import zutil.net.http.HttpHeader;
-import zutil.net.http.HttpPage;
-import zutil.net.http.HttpPrintStream;
-import zutil.net.http.HttpServer;
+package zutil.net.http;
 
 import java.io.IOException;
 import java.util.Map;

test/zutil/net/http/HttpURLTest.java

@@ -22,17 +22,16 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net.http;
 
 import org.junit.Test;
-import zutil.net.http.HttpURL;
 
 import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.both;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 
+
 public class HttpURLTest {
 
 	@Test

test/zutil/net/nio/NetworkClientTest.java

@@ -22,9 +22,8 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net.nio;
 
-import zutil.net.nio.NioClient;
 import zutil.net.nio.message.StringMessage;
 import zutil.net.nio.response.PrintRsp;
 

test/zutil/net/nio/NetworkServerTest.java

@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
-
-import zutil.net.nio.NioServer;
+package zutil.net.nio;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;

test/zutil/net/ssdp/SSDPClientTest.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net.ssdp;
 
 import zutil.log.LogUtil;
 import zutil.net.ssdp.SSDPClient;
@@ -30,6 +30,7 @@ import zutil.net.ssdp.SSDPClient;
 import java.io.IOException;
 import java.util.logging.Level;
 
+
 /**
  * Created by Ziver on 2015-09-29.
  */

test/zutil/net/ssdp/SSDPServerTest.java

@@ -22,15 +22,14 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net.ssdp;
 
 import zutil.log.LogUtil;
-import zutil.net.ssdp.SSDPServer;
-import zutil.net.ssdp.StandardSSDPInfo;
 
 import java.io.IOException;
 import java.util.logging.Level;
 
+
 /**
  * Created by Ziver on 2015-09-29.
  */

test/zutil/net/update/UpdateClientTest.java

@@ -22,18 +22,16 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net.update;
 
 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;
 
 import java.awt.*;
 import java.util.logging.Level;
 
+
 public class UpdateClientTest implements ProgressListener<UpdateClient, FileInfo>{
 	public static void main(String[] args){
 		LogUtil.setLevel("zutil", Level.FINEST);

test/zutil/net/update/UpdateServerTest.java

@@ -22,14 +22,14 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net.update;
 
 import zutil.log.CompactLogFormatter;
 import zutil.log.LogUtil;
-import zutil.net.update.UpdateServer;
 
 import java.util.logging.Level;
 
+
 public class UpdateServerTest {
 	public static void main(String[] args){
 		try {

test/zutil/net/upnp/UPnPServerTest.java

@@ -22,19 +22,19 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net.upnp;
 
 import zutil.io.MultiPrintStream;
 import zutil.net.http.HttpServer;
 import zutil.net.ssdp.SSDPServer;
-import zutil.net.upnp.UPnPMediaServer;
-import zutil.net.upnp.services.UPnPContentDirectory;
+import zutil.net.upnp.service.UPnPContentDirectory;
 import zutil.net.ws.WebServiceDef;
 import zutil.net.ws.soap.SOAPHttpPage;
 
 import java.io.File;
 import java.io.IOException;
 
+
 public class UPnPServerTest {
 	
 	public static void main(String[] args) throws IOException{		

test/zutil/net/ws/soap/SOAPClientTest.java

@@ -22,17 +22,18 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net.ws.soap;
 
 import zutil.log.CompactLogFormatter;
 import zutil.log.LogUtil;
 import zutil.net.ws.WSInterface;
-import zutil.net.ws.soap.SOAPClientFactory;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.logging.Level;
 
+
+// TODO: COnvert to JUnit
 public class SOAPClientTest {
 
 	public static void main(String[] args) throws InstantiationException, IllegalAccessException, MalformedURLException {

test/zutil/net/ws/soap/SOAPTest.java

@@ -22,19 +22,20 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.net.ws.soap;
 
 import org.dom4j.Document;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
+
 import zutil.net.ws.WSInterface;
 import zutil.net.ws.WSInterface.WSNamespace;
 import zutil.net.ws.WSReturnObject;
 import zutil.net.ws.WebServiceDef;
-import zutil.net.ws.soap.SOAPHttpPage;
 import zutil.parser.wsdl.WSDLWriter;
 
 
+// TODO: Convert to JUnit
 public class SOAPTest {
     /************************* TEST CASES ************************/
 	public static void main(String[] args){

test/zutil/parser/BBCodeParserTest.java

@@ -22,15 +22,14 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.parser;
 
 import org.junit.Test;
-import zutil.parser.BBCodeParser;
 
 import static org.junit.Assert.assertEquals;
 
 
-public class ParserTest{
+public class BBCodeParserTest{
 
 	@Test
 	public void BBCodeParser() {

test/zutil/parser/Base64Test.java

@@ -22,16 +22,15 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.parser;
 
 import org.junit.Test;
-import zutil.parser.Base64Decoder;
-import zutil.parser.Base64Encoder;
 
 import java.util.Base64;
 
 import static org.junit.Assert.assertEquals;
 
+
 public class Base64Test {
 
 	@Test

test/zutil/parser/CSVParserTest.java

@@ -22,17 +22,16 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.parser;
 
 import org.junit.Test;
-import zutil.parser.CSVParser;
-import zutil.parser.DataNode;
 
 import java.io.IOException;
 import java.io.StringReader;
 
 import static org.junit.Assert.assertEquals;
 
+
 /**
  * Created by ezivkoc on 2015-07-30.
  */

test/zutil/parser/TemplatorTest.java

@@ -22,16 +22,16 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.parser;
 
 import org.junit.Test;
-import zutil.parser.Templator;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
 import static org.junit.Assert.assertEquals;
 
+
 /**
  * Created by Ziver on 2015-03-23.
  */

test/zutil/parser/URLDecoderTest.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.parser;
 
 import org.junit.Test;
 import zutil.parser.URLDecoder;

test/zutil/parser/binary/BinaryStructTest.java

@@ -22,15 +22,14 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.parser.binary;
 
 import org.junit.Test;
-import zutil.parser.binary.BinaryStruct;
-import zutil.parser.binary.BinaryStructParser;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 
+
 /**
  * Created by Ziver on 2016-01-28.
  */

test/zutil/parser/json/JSONParserTest.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.parser.json;
 
 import org.junit.Test;
 import zutil.parser.DataNode;

test/zutil/parser/json/JSONSerializerBenchmark.java

@@ -22,17 +22,18 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.parser.json;
 
 import com.carrotsearch.junitbenchmarks.BenchmarkRule;
 import org.junit.Rule;
 import org.junit.Test;
-import zutil.test.JSONSerializerTest.TestClass;
+import zutil.parser.json.JSONSerializerTest.TestClass;
 
 import java.io.*;
 
 import static org.junit.Assert.assertEquals;
 
+
 public class JSONSerializerBenchmark {
     private static final int TEST_EXECUTIONS = 2000;
 

test/zutil/parser/json/JSONSerializerTest.java

@@ -22,13 +22,11 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.parser.json;
 
 import org.junit.Assert;
 import org.junit.Test;
 import zutil.io.StringOutputStream;
-import zutil.parser.json.JSONObjectInputStream;
-import zutil.parser.json.JSONObjectOutputStream;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -41,6 +39,7 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
+
 public class JSONSerializerTest{
 
     @Test

test/zutil/struct/BloomFilterTest.java

@@ -22,15 +22,15 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.struct;
 
 import junit.framework.TestCase;
-import zutil.struct.BloomFilter;
 
 import java.text.DecimalFormat;
 import java.util.HashSet;
 import java.util.Random;
 
+
 /**
  * This code may be used, modified, and redistributed provided that the 
  * author tag below remains intact.

test/zutil/struct/CircularBufferTest.java

@@ -22,10 +22,9 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.struct;
 
 import org.junit.Test;
-import zutil.struct.CircularBuffer;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -33,6 +32,7 @@ import java.util.NoSuchElementException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+
 /**
  * Created by Ziver on 2015-09-22.
  */

test/zutil/struct/TimedHashSetTest.java

@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
+package zutil.struct;
 
 import org.junit.Test;
-import zutil.struct.TimedHashSet;
 
 import static org.junit.Assert.assertFalse;
 
+
 /**
  * Created by Ziver on 2015-11-20.
  */

test/zutil/test/FileFinderHasherTest.java

@@ -1,50 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Ziver Koc
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package zutil.test;
-
-import zutil.Hasher;
-import zutil.io.file.FileUtil;
-
-import java.io.File;
-import java.net.URISyntaxException;
-import java.util.List;
-
-public class FileFinderHasherTest {
-	public static void main(String[] args) throws URISyntaxException{
-		String relativePath = "zutil/test";
-		
-		File path = FileUtil.find(relativePath);
-		List<File> files = FileUtil.search(path);
-		for(int i=0; i<files.size(); i++){
-			try {
-				System.out.println(
-						FileUtil.relativePath(files.get(i), relativePath)+
-						": "+Hasher.hash(files.get(i),"MD5"));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-}

test/zutil/ui/ConsoleTest.java

@@ -22,14 +22,13 @@
  * THE SOFTWARE.
  */
 
-package zutil.test;
-
-import zutil.ui.Console;
+package zutil.ui;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
+
 public class ConsoleTest {
 	public static void main(String[] args) throws IOException{
 		Console terminal = new Console("Console Test");