Skip to content

Fixed konqueror browser support #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed konqueror browser support #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/org/openddr/simpleapi/oddr/builder/browser/KonquerorBrowserBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@

import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.apache.commons.lang.StringUtils;
import org.openddr.simpleapi.oddr.model.UserAgent;
import org.openddr.simpleapi.oddr.model.browser.Browser;

public class KonquerorBrowserBuilder extends LayoutEngineBrowserBuilder {

private static final String KONQUEROR_VERSION_REGEXP = ".*Konqueror/([0-9a-z\\.\\-]+).*";
private static final String KONQUEROR_VERSION_REGEXP = ".*[Kk]onqueror/([0-9a-z\\.\\-]+).*";
private Pattern konquerorVersionPattern = Pattern.compile(KONQUEROR_VERSION_REGEXP);

public boolean canBuild(UserAgent userAgent) {
return (userAgent.getCompleteUserAgent().contains("Konqueror"));
return (userAgent.getCompleteUserAgent().toLowerCase().contains("konqueror"));
}

@Override
Expand Down
64 changes: 64 additions & 0 deletions test/org/openddr/simpleapi/oddr/builder/browser/KonquerorMozillaSubBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package org.openddr.simpleapi.oddr.builder.browser;

import org.junit.Test;
import org.openddr.simpleapi.oddr.model.UserAgent;
import org.openddr.simpleapi.oddr.model.UserAgentFactory;
import org.openddr.simpleapi.oddr.model.browser.Browser;
import org.w3c.ddr.simple.exception.InitializationException;
import org.w3c.ddr.simple.exception.NameException;

import java.io.IOException;

import static org.junit.Assert.*;

public class KonquerorMozillaSubBuilderTest {

private final KonquerorBrowserBuilder konquerorBrowserBuilder = new KonquerorBrowserBuilder();

@Test
public void testCanBuild() throws InitializationException, IOException, NameException {

final UserAgent wrongUserAgent = UserAgentFactory.newUserAgent("wrong user agent");
assertFalse(konquerorBrowserBuilder.canBuild(wrongUserAgent));

final UserAgent realUserAgent = UserAgentFactory.newUserAgent(
"Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.5 (like Gecko) (Exabot-Thumbnails)");
assertTrue(konquerorBrowserBuilder.canBuild(realUserAgent));

final UserAgent realUserAgentLowerCase = UserAgentFactory.newUserAgent(
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.34 (KHTML, like Gecko) konqueror/4.7.2 Safari/534.34");
assertTrue(konquerorBrowserBuilder.canBuild(realUserAgentLowerCase));
}

@Test
public void testBuild() {

UserAgent userAgent = UserAgentFactory.newUserAgent(
"Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.5 (like Gecko) (Exabot-Thumbnails)");
Browser browser = konquerorBrowserBuilder.build(userAgent, 0);

assertEquals("KDE", browser.getVendor());
assertEquals("Konqueror", browser.getModel());
assertEquals(80, browser.getConfidence());
assertEquals("3.5", browser.getVersion());
assertEquals("3", browser.getMajorRevision());
assertEquals("5", browser.getMinorRevision());
assertEquals("0", browser.getMicroRevision());
assertEquals("0", browser.getNanoRevision());


userAgent = UserAgentFactory.newUserAgent(
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.34 (KHTML, like Gecko) konqueror/4.7.2 Safari/534.34");
browser = konquerorBrowserBuilder.build(userAgent, 0);

assertEquals("KDE", browser.getVendor());
assertEquals("Konqueror", browser.getModel());
assertEquals(70, browser.getConfidence());
assertEquals("4.7.2", browser.getVersion());
assertEquals("4", browser.getMajorRevision());
assertEquals("7", browser.getMinorRevision());
assertEquals("2", browser.getMicroRevision());
assertEquals("0", browser.getNanoRevision());

}
}