All tests passing

Author: jasmith-hs

src/test/java/com/hubspot/jinjava/el/ExpressionResolverTest.java

@@ -257,7 +257,7 @@ public void unknownProperty() {
     interpreter.resolveELExpression("foo", 23);
     assertThat(interpreter.getErrorsCopy()).isEmpty();
 
-    context.put("foo", new Object());
+    context.put("foo", "");
     interpreter.resolveELExpression("foo.bar", 23);
 
     assertThat(interpreter.getErrorsCopy()).hasSize(1);
@@ -314,7 +314,10 @@ public void blackListedMethods() {
 
     assertThat(interpreter.getErrorsCopy()).isNotEmpty();
     TemplateError e = interpreter.getErrorsCopy().get(0);
-    assertThat(e.getMessage()).contains("Cannot find method 'wait'");
+    assertThat(e.getMessage())
+      .contains(
+        "Cannot find method wait with 0 parameters in class com.hubspot.jinjava.testobjects.ExpressionResolverTestObjects$MyClass"
+      );
   }
 
   @Test
@@ -324,7 +327,10 @@ public void itWillNotReturnClassObjects() {
 
     assertThat(interpreter.getErrorsCopy()).isNotEmpty();
     TemplateError e = interpreter.getErrorsCopy().get(0);
-    assertThat(e.getMessage()).contains("Cannot find method 'getClass'");
+    assertThat(e.getMessage())
+      .contains(
+        "Cannot find method getClass with 0 parameters in class com.hubspot.jinjava.testobjects.ExpressionResolverTestObjects$MyClass"
+      );
   }
 
   @Test

src/test/java/com/hubspot/jinjava/el/ext/JinjavaBeanELResolverTest.java

@@ -1,6 +1,7 @@
 package com.hubspot.jinjava.el.ext;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
@@ -9,6 +10,7 @@
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.testobjects.JinjavaBeanELResolverTestObjects;
 import javax.el.ELContext;
+import javax.el.PropertyNotFoundException;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -140,7 +142,10 @@ public void itDoesNotAllowAccessingPropertiesOfInterpreter() {
         .closeablePushCurrent(jinjava.newInterpreter())
         .get()
     ) {
-      assertThat(jinjavaBeanELResolver.getValue(elContext, a.value(), "config")).isNull();
+      assertThatThrownBy(() ->
+          jinjavaBeanELResolver.getValue(elContext, a.value(), "config")
+        )
+        .isInstanceOf(PropertyNotFoundException.class);
     }
   }
 }