update pom

cdimascio · Mar 1, 2019 · 2ede222 · 2ede222
2 parents 6ed924c + 72a6efc
commit 2ede222
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/java-dotenv-4.1.1.pom → java-dotenv-4.0.1.pom b/java-dotenv-4.1.1.pom → java-dotenv-4.0.1.pom
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.1</modelVersion>
 
   <name>java-dotenv</name>
   <description>Environment based config for the JVM</description>
@@ -96,7 +96,6 @@
 
   <build>
     <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-    <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
     <plugins>
       <plugin>
         <artifactId>kotlin-maven-plugin</artifactId>
@@ -116,6 +115,12 @@
             <goals>
               <goal>test-compile</goal>
             </goals>
+            <configuration>
+              <sourceDirs>
+                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+                <sourceDir>${project.basedir}/src/test/java</sourceDir>
+              </sourceDirs>
+            </configuration>
           </execution>
         </executions>
       </plugin>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.1</modelVersion>
 
     <name>java-dotenv</name>
     <description>Environment based config for the JVM</description>
@@ -96,7 +96,6 @@
 
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>kotlin-maven-plugin</artifactId>
@@ -116,6 +115,12 @@
                         <goals>
                             <goal>test-compile</goal>
                         </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+                                <sourceDir>${project.basedir}/src/test/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/src/test/java/tests/JavaTests.java b/src/test/java/tests/JavaTests.java
@@ -6,12 +6,10 @@
 import org.junit.Test;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 
 public class JavaTests {
     private Map<String, String> envVars;
@@ -21,7 +19,6 @@ public void setUp() {
         envVars = new HashMap<String, String>();
         envVars.put("MY_TEST_EV1", "my test ev 1");
         envVars.put("MY_TEST_EV2", "my test ev 2");
-        envVars.put("ABSENT_ENV_VARIABLE", null);
         envVars.put("WITHOUT_VALUE", "");
     }
 
@@ -37,11 +34,6 @@ public void load() {
         for (String envName : envVars.keySet()) {
             assertEquals(envVars.get(envName), dotenv.get(envName));
         }
-
-        String envName = "ABSENT_ENV_VARIABLE";
-        String defValue = "This is the default value";
-        assertEquals(defValue, dotenv.get(envName, defValue));
-        assertNull(dotenv.get(envName, defValue));
     }
 
 //    @Test
@@ -96,6 +88,7 @@ public void configureWithIgnoreMissingAndMalformed() {
             .ignoreIfMalformed()
             .ignoreIfMissing()
             .load();
+
         assertNotNull(dotenv.get("PATH"));
     }
 }