Merge branch 'master' into pr/997-stephen

core-java/src/test/java/com/baeldung/java/map/README.md

@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [The Java HashMap Under the Hood](http://www.baeldung.com/java-hashmap)

core-java/src/test/java/com/baeldung/java/nio2/README.md

@@ -1,3 +1,11 @@
 ### Relevant Articles:
 - [Introduction to the Java NIO2 File API](http://www.baeldung.com/java-nio-2-file-api)
 - [Java NIO2 Path API](http://www.baeldung.com/java-nio-2-path)
+- [A Guide To NIO2 Asynchronous File Channel](http://www.baeldung.com/java-nio2-async-file-channel)
+- [Guide to Selenium with JUnit / TestNG](http://www.baeldung.com/java-selenium-with-junit-and-testng)
+- [A Guide to NIO2 Asynchronous Socket Channel](http://www.baeldung.com/java-nio2-async-socket-channel)
+- [A Guide To NIO2 FileVisitor](http://www.baeldung.com/java-nio2-file-visitor)
+- [A Guide To NIO2 File Attribute APIs](http://www.baeldung.com/java-nio2-file-attribute)
+- [How to use the Spring FactoryBean?](http://www.baeldung.com/spring-factorybean)
+- [A Guide to WatchService in Java NIO2](http://www.baeldung.com/java-nio2-watchservice)
+- [Guide to Java NIO2 Asynchronous Channel APIs](http://www.baeldung.com/java-nio-2-async-channels)

core-java/src/test/java/com/baeldung/java8/optional/README.md

@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Guide To Java 8 Optional](http://www.baeldung.com/java-optional)

core-java/src/test/java/com/baeldung/scripting/NashornTest.java

@@ -0,0 +1,111 @@
+package com.baeldung.scripting;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.script.*;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.Map;
+
+public class NashornTest {
+
+    private ScriptEngine engine;
+
+    @Before
+    public void setUp() {
+        engine = new ScriptEngineManager().getEngineByName("nashorn");
+    }
+
+    @Test
+    public void trim() throws ScriptException {
+        engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/trim.js")));
+    }
+
+    @Test
+    public void locations() throws ScriptException {
+        engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/locations.js")));
+    }
+
+    @Test
+    public void bindProperties() throws ScriptException {
+        engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/bind.js")));
+    }
+
+    @Test
+    public void magicMethods() throws ScriptException {
+        engine.eval("var demo = load('classpath:js/no_such.js');" + "var tmp = demo.doesNotExist;" + "var none = demo.callNonExistingMethod()");
+    }
+
+    @Test
+    public void typedArrays() throws ScriptException {
+        engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/typed_arrays.js")));
+    }
+
+    @Test
+    public void basicUsage() throws ScriptException {
+        Object result = engine.eval("var greeting='hello world';" + "print(greeting);" + "greeting");
+
+        Assert.assertEquals("hello world", result);
+    }
+
+    @Test
+    public void jsonObjectExample() throws ScriptException {
+        Object obj = engine.eval("Java.asJSONCompatible({ number: 42, greet: 'hello', primes: [2,3,5,7,11,13] })");
+        Map<String, Object> map = (Map<String, Object>) obj;
+
+        Assert.assertEquals("hello", map.get("greet"));
+        Assert.assertTrue(List.class.isAssignableFrom(map
+          .get("primes")
+          .getClass()));
+    }
+
+    @Test
+    public void tryCatchGuard() throws ScriptException {
+        engine.eval("var math = loadWithNewGlobal('classpath:js/math_module.js');" + "math.failFunc();");
+    }
+
+    @Test
+    public void extensionsExamples() throws ScriptException {
+        String script = "var list = [1, 2, 3, 4, 5];" + "var result = '';" + "for each (var i in list) {" + "result+=i+'-';" + "};" + "print(result);";
+        engine.eval(script);
+    }
+
+    @Test
+    public void bindingsExamples() throws ScriptException {
+        Bindings bindings = engine.createBindings();
+        bindings.put("count", 3);
+        bindings.put("name", "baeldung");
+
+        String script = "var greeting='Hello ';" + "for(var i=count;i>0;i--) { " + "greeting+=name + ' '" + "}" + "greeting";
+
+        Object bindingsResult = engine.eval(script, bindings);
+        Assert.assertEquals("Hello baeldung baeldung baeldung ", bindingsResult);
+    }
+
+    @Test
+    public void jvmBoundaryExamples() throws ScriptException, NoSuchMethodException {
+        engine.eval("function composeGreeting(name) {" + "return 'Hello ' + name" + "}");
+
+        Invocable invocable = (Invocable) engine;
+
+        Object funcResult = invocable.invokeFunction("composeGreeting", "baeldung");
+        Assert.assertEquals("Hello baeldung", funcResult);
+
+        Object map = engine.eval("var HashMap = Java.type('java.util.HashMap');" + "var map = new HashMap();" + "map.put('hello', 'world');" + "map");
+
+        Assert.assertTrue(Map.class.isAssignableFrom(map.getClass()));
+    }
+
+    @Test
+    public void loadExamples() throws ScriptException {
+        Object loadResult = engine.eval("load('classpath:js/script.js');" + "increment(5)");
+
+        Assert.assertEquals(6.0, loadResult);
+
+        Object math = engine.eval("var math = loadWithNewGlobal('classpath:js/math_module.js');" + "math.increment(5);");
+
+        Assert.assertEquals(6.0, math);
+    }
+}

core-java/src/test/java/org/baeldung/java/collections/README.md

@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Join and Split Arrays and Collections in Java](http://www.baeldung.com/java-join-and-split)

core-java/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java

@@ -1,38 +1,26 @@
 package org.baeldung.java.io;
 
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.StandardCopyOption;
-import java.util.Scanner;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Charsets;
 import com.google.common.io.ByteSource;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.CharStreams;
 import com.google.common.io.Files;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.StandardCopyOption;
+import java.util.Scanner;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 @SuppressWarnings("unused")
 public class JavaInputStreamToXUnitTest {
@@ -163,7 +151,7 @@ public class JavaInputStreamToXUnitTest {
     // tests - InputStream to File
 
     @Test
-    public final void givenUsingPlainJava_whenConvertingAnFullInputStreamToAFile_thenCorrect() throws IOException {
+    public final void whenConvertingToFile_thenCorrect() throws IOException {
         final InputStream initialStream = new FileInputStream(new File("src/main/resources/sample.txt"));
         final byte[] buffer = new byte[initialStream.available()];
         initialStream.read(buffer);
@@ -177,7 +165,7 @@ public class JavaInputStreamToXUnitTest {
     }
 
     @Test
-    public final void givenUsingPlainJava_whenConvertingAnInProgressInputStreamToAFile_thenCorrect() throws IOException {
+    public final void whenConvertingInProgressToFile_thenCorrect() throws IOException {
         final InputStream initialStream = new FileInputStream(new File("src/main/resources/sample.txt"));
         final File targetFile = new File("src/main/resources/targetFile.tmp");
         final OutputStream outStream = new FileOutputStream(targetFile);
@@ -193,7 +181,7 @@ public class JavaInputStreamToXUnitTest {
     }
 
     @Test
-    public final void givenUsingPlainJava8_whenConvertingAnInProgressInputStreamToAFile_thenCorrect() throws IOException {
+    public final void whenConvertingAnInProgressInputStreamToFile_thenCorrect2() throws IOException {
         final InputStream initialStream = new FileInputStream(new File("src/main/resources/sample.txt"));
         final File targetFile = new File("src/main/resources/targetFile.tmp");
 
@@ -203,7 +191,7 @@ public class JavaInputStreamToXUnitTest {
     }
 
     @Test
-    public final void givenUsingGuava_whenConvertingAnInputStreamToAFile_thenCorrect() throws IOException {
+    public final void whenConvertingInputStreamToFile_thenCorrect3() throws IOException {
         final InputStream initialStream = new FileInputStream(new File("src/main/resources/sample.txt"));
         final byte[] buffer = new byte[initialStream.available()];
         initialStream.read(buffer);
@@ -215,7 +203,7 @@ public class JavaInputStreamToXUnitTest {
     }
 
     @Test
-    public final void givenUsingCommonsIO_whenConvertingAnInputStreamToAFile_thenCorrect() throws IOException {
+    public final void whenConvertingInputStreamToFile_thenCorrect4() throws IOException {
         final InputStream initialStream = FileUtils.openInputStream(new File("src/main/resources/sample.txt"));
 
         final File targetFile = new File("src/main/resources/targetFile.tmp");