Trimming trailing spaces, removing tabs by a script
- using tab width of 4 spaces
- trailing space in property files is converted to unicode, so it is
visible in sources
- bat files use CRLF
- all other text files use just LF
diff --git a/appserver/tests/community/web/helloworld/src/test/HelloJSPTestNG.java b/appserver/tests/community/web/helloworld/src/test/HelloJSPTestNG.java
index b340dd1..b14e39c 100644
--- a/appserver/tests/community/web/helloworld/src/test/HelloJSPTestNG.java
+++ b/appserver/tests/community/web/helloworld/src/test/HelloJSPTestNG.java
@@ -34,13 +34,13 @@
private static final String TEST_NAME =
"simple-webapp-jspservlet-noresource";
-
+
private String strContextRoot="hellojsp";
static String result = "";
String host=System.getProperty("http.host");
String port=System.getProperty("http.port");
-
+
/*
*If two asserts are mentioned in one method, then last assert is taken in
*to account.
@@ -52,9 +52,9 @@
@Test(groups ={ "pulse"} ) // test method
//public void webtest(String host, String port, String contextroot) throws Exception{
public void simpleJSPTestPage() throws Exception{
-
+
try{
-
+
String testurl = "http://" + host + ":" + port + "/"+ strContextRoot + "/hello.jsp";
System.out.println("URL is: "+testurl);
@@ -70,20 +70,20 @@
String line = null;
boolean result=false;
- String testLine = null;
- String EXPECTED_RESPONSE ="JSP Test Page";
+ String testLine = null;
+ String EXPECTED_RESPONSE ="JSP Test Page";
while ((line = input.readLine()) != null) {
if(line.indexOf(EXPECTED_RESPONSE)!=-1){
result=true;
testLine = line;
System.out.println(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
@@ -93,9 +93,9 @@
@Test(groups={"pulse"}) //test method for server
public void testServerRunning() throws Exception{
- //Your server is up and running!
- //
- String testurl = "http://" + host + ":" + port;
+ //Your server is up and running!
+ //
+ String testurl = "http://" + host + ":" + port;
System.out.println("URL is: "+testurl);
URL url = new URL(testurl);
echo("Connecting to: " + url.toString());
@@ -103,12 +103,12 @@
conn.connect();
int responseCode = conn.getResponseCode();
- InputStream is = conn.getInputStream();
+ InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
echo(line);
if(line.indexOf("Your Application Server is now running")!=-1){
@@ -116,17 +116,17 @@
testLine = line;
echo(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
}
-
-
+
+
@Test(groups ={ "pulse"} ) // test method
public void staticHTMLPageTest() throws Exception{
try{
-
+
String testurl = "http://" + host + ":" + port + "/"+ strContextRoot + "/first.html";
System.out.println("URL is: "+testurl);
@@ -143,30 +143,30 @@
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
if(line.indexOf("Welcome to HTML Test Program")!=-1){
result=true;
testLine = line;
System.out.println(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
}
-
+
}
-
+
@Test(groups ={ "pulse"} ) // test method
public void simpleServletTest() throws Exception{
try{
-
+
String testurl = "http://" + host + ":" + port + "/"+ strContextRoot + "/simpleservlet";
System.out.println("URL is: "+testurl);
@@ -182,24 +182,24 @@
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
if(line.indexOf("Sample Application Servlet")!=-1){
result=true;
testLine = line;
echo(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
}
-
+
}
public static void echo(String msg) {
