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

Cleaning up unused testing bits

This commit is contained in:
Joakim Erdfelt 2015-06-11 07:01:05 -07:00
parent 173acf1ae0
commit c78f9e2b7c
5 changed files with 4 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
View File

@ -18,13 +18,15 @@
package org.eclipse.jetty.start;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jetty.start.util.RebuildTestResources;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.toolchain.test.TestTracker;
import org.junit.Before;
@ -32,10 +34,6 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
public class MainTest
{
@Rule
@ -46,7 +44,6 @@ public class MainTest
{
System.setProperty("jetty.home","");
System.setProperty("jetty.base","");
System.setProperty("jetty.version",RebuildTestResources.JETTY_VERSION);
}
@Test

3
jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java
View File

@ -18,7 +18,7 @@
package org.eclipse.jetty.start;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.*;
import java.io.File;
import java.util.ArrayList;
@ -71,7 +71,6 @@ public class TestBadUseCases
@Test
public void testBadConfig() throws Exception
{
System.setProperty("jetty.version", RebuildTestResources.JETTY_VERSION);
File homeDir = MavenTestingUtils.getTestResourceDir("dist-home");
File baseDir = MavenTestingUtils.getTestResourceDir("usecases/" + caseName);

3
jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java
View File

@ -22,7 +22,6 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jetty.start.util.RebuildTestResources;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -70,8 +69,6 @@ public class TestUseCases
Path homeDir = MavenTestingUtils.getTestResourceDir("dist-home").toPath().toRealPath();
Path baseDir = MavenTestingUtils.getTestResourceDir("usecases/" + caseName).toPath().toRealPath();
System.setProperty("jetty.version",RebuildTestResources.JETTY_VERSION);
Main main = new Main();
List<String> cmdLine = new ArrayList<>();
cmdLine.add("jetty.home=" + homeDir.toString());

16
jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt
View File

@ -1,16 +0,0 @@
# The XMLs we expect (order is important)
# The LIBs we expect (order is irrelevant)
# The Properties we expect (order is irrelevant)
PROP|jetty.http.port=9090
PROP|jetty.sslContext.keyStorePath=etc/keystore
PROP|jetty.sslContext.keyStorePassword=friendly
PROP|jetty.sslContext.keyManagerPassword=icecream
PROP|jetty.sslContext.trustStorePath=etc/keystore
PROP|jetty.sslContext.trustStorePassword=sundae
PROP|java.version=1.7.0_01
# The Downloads
# The Bootlib

44
jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt
View File

@ -1,44 +0,0 @@
# The XMLs we expect (order is important)
XML|${jetty.home}/etc/jetty.xml
XML|${jetty.home}/etc/jetty-ssl.xml
XML|${jetty.home}/etc/jetty-https.xml
XML|${jetty.home}/etc/jetty-plus.xml
XML|${jetty.home}/etc/jetty-annotations.xml
XML|${jetty.home}/etc/jetty-websockets.xml
# The LIBs we expect (order is irrelevant)
LIB|${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar
LIB|${jetty.home}/lib/annotations/org.objectweb.asm-TEST.jar
LIB|${jetty.home}/lib/jetty-annotations-TEST.jar
LIB|${jetty.home}/lib/jetty-continuation-TEST.jar
LIB|${jetty.home}/lib/jetty-http-TEST.jar
LIB|${jetty.home}/lib/jetty-io-TEST.jar
LIB|${jetty.home}/lib/jetty-jndi-TEST.jar
LIB|${jetty.home}/lib/jetty-plus-TEST.jar
LIB|${jetty.home}/lib/jetty-schemas-3.1.jar
LIB|${jetty.home}/lib/jetty-security-TEST.jar
LIB|${jetty.home}/lib/jetty-server-TEST.jar
LIB|${jetty.home}/lib/jetty-util-TEST.jar
LIB|${jetty.home}/lib/jetty-xml-TEST.jar
LIB|${jetty.home}/lib/jndi/javax.activation-1.1.jar
LIB|${jetty.home}/lib/jndi/javax.transaction-api-1.2.jar
LIB|${jetty.home}/lib/servlet-api-3.1.jar
LIB|${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar
LIB|${jetty.home}/lib/websocket/javax-websocket-client-impl-TEST.jar
LIB|${jetty.home}/lib/websocket/javax-websocket-server-impl-TEST.jar
LIB|${jetty.home}/lib/websocket/websocket-api-TEST.jar
LIB|${jetty.home}/lib/websocket/websocket-client-TEST.jar
LIB|${jetty.home}/lib/websocket/websocket-common-TEST.jar
LIB|${jetty.home}/lib/websocket/websocket-server-TEST.jar
LIB|${jetty.home}/lib/websocket/websocket-servlet-TEST.jar
# The Properties we expect (order is irrelevant)
PROP|jetty.http.port=12345
PROP|jetty.sslContext.keyStorePath=etc/keystore
PROP|jetty.sslContext.keyStorePassword=friendly
PROP|jetty.sslContext.keyManagerPassword=icecream
PROP|jetty.sslContext.trustStorePath=etc/keystore
PROP|jetty.sslContext.trustStorePassword=sundae
# JVM Args
# JVM|-Xms1024m