Merge branch 'master' of https://github.com/fluxw42/java-design-patterns into fluxw42-master

Conflicts:
	monostate/src/main/java/com/iluwatar/monostate/LoadBalancer.java
This commit is contained in:
Ilkka Seppala
2015-12-26 12:36:38 +02:00
31 changed files with 1104 additions and 59 deletions

View File

@ -0,0 +1,18 @@
package com.iluwatar.model.view.presenter;
import org.junit.Test;
/**
*
* Application test
*
*/
public class AppTest {
@Test
public void test() {
String[] args = {};
App.main(args);
}
}

View File

@ -0,0 +1,24 @@
package com.iluwatar.model.view.presenter;
import org.junit.Test;
import java.io.FileNotFoundException;
import java.io.IOException;
import static org.junit.Assert.*;
/**
* Date: 12/21/15 - 12:12 PM
*
* @author Jeroen Meulemeester
*/
public class FileLoaderTest {
@Test
public void testLoadData() throws Exception {
final FileLoader fileLoader = new FileLoader();
fileLoader.setFileName("non-existing-file");
assertNull(fileLoader.loadData());
}
}