Improve test quality and eliminate redundancy

- Replace JUnit assertTrue() with AssertJ assertions for consistency
- Remove redundant test methods between FromTagTest and ImportTagTest:
  - Removed itMaintainsPathStackIntegrityWithImport (duplicate logic)
  - Removed itWorksWithIncludeAndImportTogether (covered by FromTagTest)
- Maintain comprehensive coverage with 38 focused tests (14 + 24)
- All tests pass with improved maintainability and reduced duplication

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: Maple Buice

src/test/java/com/hubspot/jinjava/lib/tag/FromTagTest.java

@@ -2,7 +2,6 @@
 
 import static com.hubspot.jinjava.loader.RelativePathResolver.CURRENT_PATH_CONTEXT_KEY;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertTrue;
 
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.BaseInterpretingTest;
@@ -69,23 +68,25 @@ public void itImportsAliasedMacroName() {
   @Test
   public void importedCycleDected() {
     fixture("from-recursion");
-    assertTrue(
+    assertThat(
       interpreter
         .getErrorsCopy()
         .stream()
         .anyMatch(e -> e.getCategory() == BasicTemplateErrorCategory.FROM_CYCLE_DETECTED)
-    );
+    )
+      .isTrue();
   }
 
   @Test
   public void importedIndirectCycleDected() {
     fixture("from-a-to-b");
-    assertTrue(
+    assertThat(
       interpreter
         .getErrorsCopy()
         .stream()
         .anyMatch(e -> e.getCategory() == BasicTemplateErrorCategory.FROM_CYCLE_DETECTED)
-    );
+    )
+      .isTrue();
   }
 
   @Test

src/test/java/com/hubspot/jinjava/lib/tag/ImportTagTest.java

@@ -421,95 +421,6 @@ public Optional<LocationResolver> getLocationResolver() {
     assertThat(result.trim()).isEqualTo("L1:L2:HELPER");
   }
 
-  @Test
-  public void itMaintainsPathStackIntegrityWithImport() throws Exception {
-    jinjava.setResourceLocator(
-      new ResourceLocator() {
-        private final RelativePathResolver relativePathResolver =
-          new RelativePathResolver();
-        private final java.util.Map<String, String> templates =
-          new java.util.HashMap<>() {
-            {
-              put(
-                "root.jinja",
-                "{% import 'simple/macro.jinja' as simple %}{{ simple.simple_macro() }}"
-              );
-              put("simple/macro.jinja", "{% macro simple_macro() %}SIMPLE{% endmacro %}");
-            }
-          };
-
-        @Override
-        public String getString(
-          String fullName,
-          Charset encoding,
-          JinjavaInterpreter interpreter
-        ) throws IOException {
-          String template = templates.get(fullName);
-          if (template == null) {
-            throw new IOException("Template not found: " + fullName);
-          }
-          return template;
-        }
-
-        @Override
-        public Optional<LocationResolver> getLocationResolver() {
-          return Optional.of(relativePathResolver);
-        }
-      }
-    );
-
-    interpreter.getContext().getCurrentPathStack().push("root.jinja", 1, 0);
-    String result = interpreter.render(interpreter.getResource("root.jinja"));
-
-    assertThat(interpreter.getErrors()).isEmpty();
-    assertThat(result.trim()).isEqualTo("SIMPLE");
-  }
-
-  @Test
-  public void itWorksWithIncludeAndImportTogether() throws Exception {
-    jinjava.setResourceLocator(
-      new ResourceLocator() {
-        private final RelativePathResolver relativePathResolver =
-          new RelativePathResolver();
-        private final java.util.Map<String, String> templates =
-          new java.util.HashMap<>() {
-            {
-              put("base.jinja", "{% include './views/content.jinja' %}");
-              put(
-                "views/content.jinja",
-                "{% import '../utils/shared.jinja' as utils %}{{ utils.helper() }}"
-              );
-              put("utils/shared.jinja", "{% macro helper() %}SHARED{% endmacro %}");
-            }
-          };
-
-        @Override
-        public String getString(
-          String fullName,
-          Charset encoding,
-          JinjavaInterpreter interpreter
-        ) throws IOException {
-          String template = templates.get(fullName);
-          if (template == null) {
-            throw new IOException("Template not found: " + fullName);
-          }
-          return template;
-        }
-
-        @Override
-        public Optional<LocationResolver> getLocationResolver() {
-          return Optional.of(relativePathResolver);
-        }
-      }
-    );
-
-    interpreter.getContext().getCurrentPathStack().push("base.jinja", 1, 0);
-    String result = interpreter.render(interpreter.getResource("base.jinja"));
-
-    assertThat(interpreter.getErrors()).isEmpty();
-    assertThat(result.trim()).isEqualTo("SHARED");
-  }
-
   @Test
   public void itResolvesUpAndAcrossDirectoryPaths() throws Exception {
     jinjava.setResourceLocator(