Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing up test expectations based on reworked module setup for spdy + npn

This commit is contained in:
Joakim Erdfelt 2014-04-07 09:48:34 -07:00
parent 2897027f53
commit 5ca59f6087
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-spdy/spdy-npn-tests/src/test/java/org/eclipse/jetty/spdy/server/NPNModuleTest.java
View File

@ -67,7 +67,7 @@ public class NPNModuleTest
@Parameters(name = "{index}: mod:{0}")
public static List<Object[]> data()
{
File npnBootModDir = MavenTestingUtils.getProjectDir("../spdy-http-server/src/main/config/modules/protonego");
File npnBootModDir = MavenTestingUtils.getProjectDir("../spdy-http-server/src/main/config/modules/protonego-impl");
List<Object[]> data = new ArrayList<>();
for (File file : npnBootModDir.listFiles())
{
@ -99,7 +99,7 @@ public class NPNModuleTest
@Test
public void testModuleValues() throws IOException
{
File modFile = basehome.getFile("modules/protonego/" + modBootFile);
File modFile = basehome.getFile("modules/protonego-impl/" + modBootFile);
Module mod = new Module(basehome,modFile);
assertNotNull("module",mod);
@ -118,7 +118,7 @@ public class NPNModuleTest
}
}
for (String line : mod.getInitialise())
for (String line : mod.getJvmArgs())
{
expectedBootClasspath.remove(line);
}
@ -126,10 +126,10 @@ public class NPNModuleTest
if (expectedBootClasspath.size() > 0)
{
StringBuilder err = new StringBuilder();
err.append("XBootClasspath mismatch between [files] and [ini-template]");
err.append("XBootClasspath mismatch between [files] and [exec]");
err.append("\nThe following are inferred from your [files] definition in ");
err.append(modFile.getAbsolutePath());
err.append("\nbut are not referenced in your [ini-template] section");
err.append("\nbut are not referenced in your [exec] section");
for (String entry : expectedBootClasspath)
{
err.append("\n").append(entry);