Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions opengrok-web/src/main/java/org/opengrok/web/PageConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -1890,4 +1890,9 @@ public boolean evaluateMatchOffset() {
}
return false;
}

@VisibleForTesting
String getFragmentIdentifier() {
return fragmentIdentifier;
}
}
49 changes: 49 additions & 0 deletions opengrok-web/src/test/java/org/opengrok/web/PageConfigTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
import static org.mockito.Mockito.when;
import static org.opengrok.indexer.condition.RepositoryInstalled.Type.MERCURIAL;
import static org.opengrok.indexer.history.LatestRevisionUtil.getLatestRevision;
import static org.opengrok.indexer.web.Util.fixPathIfWindows;

/**
* Unit tests for the {@code PageConfig} class.
Expand Down Expand Up @@ -1091,4 +1092,52 @@ public String getPathInfo() {
// cleanup
assertTrue(file.setReadable(true, false));
}

@Test
void testEvaluateMatchOffsetNoParam() {
final String relativePath = Path.of("mercurial", "main.c").toString();
HttpServletRequest req = new DummyHttpServletRequest() {
@Override
public String getPathInfo() {
return fixPathIfWindows(relativePath);
}
};

final File file = new File(RuntimeEnvironment.getInstance().getSourceRootPath(), relativePath);
assertTrue(file.exists());
PageConfig cfg = PageConfig.get(req);
assertFalse(cfg.evaluateMatchOffset());
assertNull(cfg.getFragmentIdentifier());
}

private static Stream<Pair<String, String>> getParamsForTestEvaluateMatchOffset() {
return Stream.of(Pair.of("0", "1"),
Pair.of("42", "3"));
}

@ParameterizedTest
@MethodSource("getParamsForTestEvaluateMatchOffset")
void testEvaluateMatchOffset(Pair<String, String> offsetPair) {
final String relativePath = Path.of("mercurial", "main.c").toString();
HttpServletRequest req = new DummyHttpServletRequest() {
@Override
public String getPathInfo() {
return fixPathIfWindows(relativePath);
}

@Override
public String getParameter(String name) {
if (name.equals(QueryParameters.MATCH_OFFSET_PARAM)) {
return offsetPair.getLeft();
}
return null;
}
};

final File file = new File(RuntimeEnvironment.getInstance().getSourceRootPath(), relativePath);
assertTrue(file.exists());
PageConfig cfg = PageConfig.get(req);
assertTrue(cfg.evaluateMatchOffset());
assertEquals(offsetPair.getRight(), cfg.getFragmentIdentifier());
}
}
Loading