Skip to content

Commit

Permalink
WW-5363 Add test coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
kusalk committed Nov 13, 2023
1 parent e9c996a commit 926a846
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public boolean internalContainsKey(String key) {
}

public Object internalGet(String key) {
return chainedGets(key, super::internalGet, this::chainedContextGet, this::stackGet, this::stackContextGet);
return chainedGets(key, this::chainedContextGet, this::stackGet, this::stackContextGet);
}

@SafeVarargs
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package org.apache.struts2.views.velocity;

import com.opensymphony.xwork2.util.ValueStack;
import org.apache.velocity.VelocityContext;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;

import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.singletonList;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;

public class StrutsVelocityContextTest {

@Rule
public MockitoRule mockitoRule = MockitoJUnit.rule();

private StrutsVelocityContext strutsVelocityContext;

@Mock
private VelocityContext chainedContext;

@Mock
private ValueStack stack;

private Map<String, Object> stackContext;

@Before
public void setUp() throws Exception {
stackContext = new HashMap<>();
when(stack.getContext()).thenReturn(stackContext);
strutsVelocityContext = new StrutsVelocityContext(singletonList(chainedContext), stack);
}

@Test
public void getChainedValue() {
when(chainedContext.internalGet("foo")).thenReturn("bar");
assertEquals("bar", strutsVelocityContext.internalGet("foo"));
}

@Test
public void getStackValue() {
when(stack.findValue("foo")).thenReturn("bar");
assertEquals("bar", strutsVelocityContext.internalGet("foo"));
}

@Test
public void getStackContextValue() {
stackContext.put("foo", "bar");
assertEquals("bar", strutsVelocityContext.internalGet("foo"));
}

@Test
public void getValuePrecedence() {
when(chainedContext.internalGet("foo")).thenReturn("bar");
assertEquals("bar", strutsVelocityContext.internalGet("foo"));

when(stack.findValue("foo")).thenReturn("baz");
assertEquals("bar", strutsVelocityContext.internalGet("foo"));

stackContext.put("foo", "qux");
assertEquals("bar", strutsVelocityContext.internalGet("foo"));
}
}

0 comments on commit 926a846

Please sign in to comment.