[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/scannersTests AppletScannerTest.java,1.30,1.31
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/scannersTests AppletScannerTest.java,1.30,1.31 BaseHREFScannerTest.java,1.29,1.30 FormScannerTest.java,1.38,1.39 FrameSetScannerTest.java,1.29,1.30 ImageScannerTest.java,1.36,1.37 LinkScannerTest.java,1.45,1.46 ScriptScannerTest.java,1.44,1.45 StyleScannerTest.java,1.31,1.32 TagScannerTest.java,1.34,1.35
|
From: <der...@us...> - 2003-10-27 02:20:20
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests
In directory sc8-pr-cvs1:/tmp/cvs-serv25308/tests/scannersTests
Modified Files:
AppletScannerTest.java BaseHREFScannerTest.java
FormScannerTest.java FrameSetScannerTest.java
ImageScannerTest.java LinkScannerTest.java
ScriptScannerTest.java StyleScannerTest.java
TagScannerTest.java
Log Message:
Some speed improvements; passing tags to evaluate, creating strings without string buffers, etc.
Index: AppletScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/AppletScannerTest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** AppletScannerTest.java 26 Oct 2003 19:46:26 -0000 1.30
--- AppletScannerTest.java 27 Oct 2003 02:18:04 -0000 1.31
***************
*** 47,57 ****
}
- public void testEvaluate()
- {
- AppletScanner scanner = new AppletScanner("-a");
- boolean retVal = scanner.evaluate(" Applet ",null);
- assertEquals("Evaluation of APPLET tag",new Boolean(true),new Boolean(retVal));
- }
-
public void testScan() throws ParserException
{
--- 47,50 ----
Index: BaseHREFScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/BaseHREFScannerTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** BaseHREFScannerTest.java 26 Oct 2003 19:46:26 -0000 1.29
--- BaseHREFScannerTest.java 27 Oct 2003 02:18:05 -0000 1.30
***************
*** 63,73 ****
}
- public void testEvaluate() {
- String testData1 = "BASE HREF=\"http://www.abc.com/\"";
- assertTrue("Data 1 Should have evaluated true",scanner.evaluate(testData1,null));
- String testData2 = "Base href=\"http://www.abc.com/\"";
- assertTrue("Data 2 Should have evaluated true",scanner.evaluate(testData2,null));
- }
-
public void testScan() throws ParserException{
createParser("<html><head><TITLE>test page</TITLE><BASE HREF=\"http://www.abc.com/\"><a href=\"home.cfm\">Home</a>...</html>","http://www.google.com/test/index.html");
--- 63,66 ----
Index: FormScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/FormScannerTest.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** FormScannerTest.java 26 Oct 2003 19:46:26 -0000 1.38
--- FormScannerTest.java 27 Oct 2003 02:18:05 -0000 1.39
***************
*** 88,101 ****
}
- public void testEvaluate() {
- String line1="form method=\"post\" onsubmit=\"return implementsearch()\" name=frmsearch id=form";
- String line2="FORM method=\"post\" onsubmit=\"return implementsearch()\" name=frmsearch id=form";
- String line3="Form method=\"post\" onsubmit=\"return implementsearch()\" name=frmsearch id=form";
- FormScanner formScanner = new FormScanner("",Parser.createParser(""));
- assertTrue("Line 1",formScanner.evaluate(line1,null));
- assertTrue("Line 2",formScanner.evaluate(line2,null));
- assertTrue("Line 3",formScanner.evaluate(line3,null));
- }
-
public void assertTypeNameSize(String description,String type,String name,String size,InputTag inputTag) {
assertEquals(description+" type",type,inputTag.getAttribute("TYPE"));
--- 88,91 ----
Index: FrameSetScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/FrameSetScannerTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** FrameSetScannerTest.java 26 Oct 2003 19:46:26 -0000 1.29
--- FrameSetScannerTest.java 27 Oct 2003 02:18:05 -0000 1.30
***************
*** 33,36 ****
--- 33,37 ----
import org.htmlparser.tags.FrameSetTag;
import org.htmlparser.tags.FrameTag;
+ import org.htmlparser.tags.Tag;
import org.htmlparser.tests.ParserTestCase;
import org.htmlparser.util.ParserException;
***************
*** 45,58 ****
public FrameSetScannerTest(String name) {
super(name);
- }
-
- public void testEvaluate() {
- String line1="frameset rows=\"115,*\" frameborder=\"NO\" border=\"0\" framespacing=\"0\"";
- String line2="FRAMESET rows=\"115,*\" frameborder=\"NO\" border=\"0\" framespacing=\"0\"";
- String line3="Frameset rows=\"115,*\" frameborder=\"NO\" border=\"0\" framespacing=\"0\"";
- FrameSetScanner frameSetScanner = new FrameSetScanner("");
- assertTrue("Line 1",frameSetScanner.evaluate(line1,null));
- assertTrue("Line 2",frameSetScanner.evaluate(line2,null));
- assertTrue("Line 3",frameSetScanner.evaluate(line3,null));
}
--- 46,49 ----
Index: ImageScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/ImageScannerTest.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ImageScannerTest.java 26 Oct 2003 19:46:26 -0000 1.36
--- ImageScannerTest.java 27 Oct 2003 02:18:05 -0000 1.37
***************
*** 31,34 ****
--- 31,35 ----
import org.htmlparser.Node;
import org.htmlparser.Parser;
+ import org.htmlparser.lexer.nodes.TagNode;
import org.htmlparser.scanners.ImageScanner;
import org.htmlparser.scanners.TableScanner;
***************
*** 68,72 ****
{
ImageScanner scanner = new ImageScanner("-i",new LinkProcessor());
! boolean retVal = scanner.evaluate(" img ",null);
assertEquals("Evaluation of IMG tag",new Boolean(true),new Boolean(retVal));
}
--- 69,75 ----
{
ImageScanner scanner = new ImageScanner("-i",new LinkProcessor());
! Tag tag = new Tag ();
! tag.setTagName ("img");
! boolean retVal = scanner.evaluate (tag ,null);
assertEquals("Evaluation of IMG tag",new Boolean(true),new Boolean(retVal));
}
Index: LinkScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/LinkScannerTest.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** LinkScannerTest.java 26 Oct 2003 19:46:26 -0000 1.45
--- LinkScannerTest.java 27 Oct 2003 02:18:05 -0000 1.46
***************
*** 84,88 ****
assertTrue("Third node should be a tag",node[2] instanceof Tag);
assertTrue("Fourth node should be a link",node[3] instanceof LinkTag);
! // LinkScanner.evaluate() says anythin less than 5 characters isn't a link:
assertTrue("Fifth node should be a tag",node[4] instanceof Tag);
assertTrue("Sixth node should be a tag",node[5] instanceof Tag);
--- 84,88 ----
assertTrue("Third node should be a tag",node[2] instanceof Tag);
assertTrue("Fourth node should be a link",node[3] instanceof LinkTag);
! // LinkScanner.evaluate() says no HREF means it isn't a link:
assertTrue("Fifth node should be a tag",node[4] instanceof Tag);
assertTrue("Sixth node should be a tag",node[5] instanceof Tag);
***************
*** 158,162 ****
{
LinkScanner scanner = new LinkScanner("-l");
! boolean retVal = scanner.evaluate(" a href ",null);
assertEquals("Evaluation of the Link tag",new Boolean(true),new Boolean(retVal));
}
--- 158,165 ----
{
LinkScanner scanner = new LinkScanner("-l");
! Tag tag = new Tag ();
! tag.setTagName ("a");
! tag.setAttribute ("href", "https://www.redhat.com/");
! boolean retVal = scanner.evaluate(tag,null);
assertEquals("Evaluation of the Link tag",new Boolean(true),new Boolean(retVal));
}
Index: ScriptScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/ScriptScannerTest.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ScriptScannerTest.java 26 Oct 2003 19:46:27 -0000 1.44
--- ScriptScannerTest.java 27 Oct 2003 02:18:05 -0000 1.45
***************
*** 49,59 ****
}
- public void testEvaluate()
- {
- ScriptScanner scanner = new ScriptScanner("-s");
- boolean retVal = scanner.evaluate(" script ",null);
- assertEquals("Evaluation of SCRIPT tag",new Boolean(true),new Boolean(retVal));
- }
-
public void testScan() throws ParserException
{
--- 49,52 ----
Index: StyleScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/StyleScannerTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** StyleScannerTest.java 26 Oct 2003 19:46:27 -0000 1.31
--- StyleScannerTest.java 27 Oct 2003 02:18:05 -0000 1.32
***************
*** 44,54 ****
}
- public void testEvaluate()
- {
- StyleScanner scanner = new StyleScanner("-s");
- boolean retVal = scanner.evaluate("style ",null);
- assertEquals("Evaluation of STYLE tag",new Boolean(true),new Boolean(retVal));
- }
-
public void testScan() throws ParserException
{
--- 44,47 ----
Index: TagScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/TagScannerTest.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** TagScannerTest.java 26 Oct 2003 19:46:27 -0000 1.34
--- TagScannerTest.java 27 Oct 2003 02:18:05 -0000 1.35
***************
*** 125,129 ****
TagScanner scanner = new TagScanner() {
public Tag scan(Tag tag,String url,Lexer lexer) { return null;}
! public boolean evaluate(String s,TagScanner previousOpenScanner) { return false; }
public String [] getID() { return null; }
protected Tag createTag (Page page, int start, int end, Vector attributes, Tag tag, String url) { return null; }
--- 125,129 ----
TagScanner scanner = new TagScanner() {
public Tag scan(Tag tag,String url,Lexer lexer) { return null;}
! public boolean evaluate(Tag tag,TagScanner previousOpenScanner) { return false; }
public String [] getID() { return null; }
protected Tag createTag (Page page, int start, int end, Vector attributes, Tag tag, String url) { return null; }
|
