Author: adietish
Date: 2010-10-01 05:05:37 -0400 (Fri, 01 Oct 2010)
New Revision: 25384
Added:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java
Removed:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxDistroFake.java
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage
Reporter.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/ReportingEclipseEnvironmentFake.java
Log:
[JBIDE-7208] centos detection fixed
Modified: trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage
Reporter.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage
Reporter.launch 2010-10-01 08:59:37 UTC (rev 25383)
+++ trunk/usage/tests/org.jboss.tools.usage.test/JBoss Developer Studio Usage
Reporter.launch 2010-10-01 09:05:37 UTC (rev 25384)
@@ -6,7 +6,7 @@
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation"
value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Developer
Studio Usage Reporter"/>
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m
-Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product"
value="com.jboss.jbds.product.product"/>
-<stringAttribute key="selected_target_plugins"
value="javax.activation@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.net.linux.x86_64@default:false,com.springsource.javax.servlet.jsp@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.repository@default:default,javax.mail@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.common@default:default,org.eclipse.core.contenttype@default:default,org.apache.lucene@default:default,org.eclipse.core.net@default:default,org.eclipse.core.variables@default:default,com.springsource.javax.jms@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help.base@default:default,org.apache.jasper@default:default,org.eclipse.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:fa!
lse,ch.qos.logback.slf4j@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.jface@default:default,org.slf4j.api@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.help.ui@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.osgi,org.eclipse.help@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.text@default:default,org.eclipse.core.commands@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,javax.transaction@default:false,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.metadata.r!
epository@default:default,com.springsource.javax.el@default:de!
fault,ch
.qos.logback.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.preferences@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.apache.lucene.analysis@default:default,org.apache.commons.el@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ui.workbench@default:default,com.jboss.jbds.product@default:default,org.eclipse.jface.text@default:default,org.eclipse.swt@default:default,javax.servlet.jsp@default:default,org.eclipse.ecf@default:default,ch.qos.logback.classic@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@defa!
ult:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.transforms.hook@default:false,org.apache.ant@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jface.databinding@default:default"/>
-<stringAttribute key="selected_workspace_plugins"
value="org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins"
value="org.eclipse.equinox.http.servlet@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.engine@default:default,com.jboss.jbds.product@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.http.jetty@default:default,ch.qos.logback.classic@default:default,org.apache.ant@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.resources@default:default,org.apache.lucene@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.jface.text@default:default,com.ibm.icu@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.repository@default:def!
ault,org.mortbay.jetty.util@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.transforms.hook@default:false,com.springsource.javax.el@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.commands@default:default,javax.activation@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,javax.servlet.jsp@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.help.base@default:default,org.eclipse.core.filesystem@default:default,org.apache.commons.el@default:default,org.apache.jasper@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.text@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org!
.eclipse.equinox.common@2:true,org.eclipse.ecf.identity@defaul!
t:defaul
t,org.eclipse.help@default:default,org.eclipse.ui.views@default:default,com.springsource.javax.servlet@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.net.linux.x86_64@default:false,com.springsource.javax.jms@default:default,org.eclipse.osgi.services@default:default,org.jboss.tools.xulrunner.initializer@default:false,javax.transaction@default:false,ch.qos.logback.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.swt@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.core.databinding@default:default,javax.mail@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.help.ui@default:default!
,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jface@default:default,org.slf4j.api@default:default"/>
+<stringAttribute key="selected_workspace_plugins"
value="org.mozilla.xpcom@default:default,org.mozilla.xulrunner.gtk.linux.x86_64@default:default,org.mozilla.xulrunner.cocoa.macosx@default:default,org.mozilla.xulrunner.win32.win32.x86@default:default,org.mozilla.xulrunner.gtk.linux.x86@default:default,org.mozilla.xulrunner.carbon.macosx@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig"
value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java
===================================================================
---
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java 2010-10-01
08:59:37 UTC (rev 25383)
+++
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/LinuxDistroTest.java 2010-10-01
09:05:37 UTC (rev 25384)
@@ -12,44 +12,42 @@
import static org.junit.Assert.assertEquals;
import org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem;
-import org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem.LinuxDistro;
-import org.jboss.tools.usage.test.fakes.LinuxDistroFake;
+import org.jboss.tools.usage.test.fakes.LinuxSystemFake;
import org.junit.Test;
public class LinuxDistroTest {
@Test
public void canExtractFedoraVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.FEDORA.getName(), "Fedora
release 13 (Goddard)");
- assertEquals("13", distro.getVersion());
+ LinuxSystem linuxSystem = new
LinuxSystemFake(LinuxSystem.INSTANCE.FEDORA.getReleaseFilePath(), "Fedora release 13
(Goddard)");
+ assertEquals("Fedora 13", linuxSystem.getDistroNameAndVersion());
}
@Test
public void canExtractUbuntuVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.UBUNTU.getName(),
+ LinuxSystem linuxSystem = new
LinuxSystemFake(LinuxSystem.INSTANCE.UBUNTU.getReleaseFilePath(),
"DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=9.04\nDISTRIB_CODENAME=jaunty\nDISTRIB_DESCRIPTION=\"Ubuntu
9.04\"");
- assertEquals("Ubuntu9.04", distro.getNameAndVersion());
+ assertEquals("Ubuntu 9.04", linuxSystem.getDistroNameAndVersion());
}
@Test
public void canExtractRedHatVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.REDHAT.getName(),
+ LinuxSystem linuxSystem = new
LinuxSystemFake(LinuxSystem.INSTANCE.REDHAT.getReleaseFilePath(),
"Red Hat Enterprise Linux Workstation release 6.0 (Santiago)");
- assertEquals("RedHat6.0", distro.getNameAndVersion());
+ assertEquals("RedHat 6.0", linuxSystem.getDistroNameAndVersion());
}
@Test
public void canExtractGentooVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.GENTOO.getName(),
+ LinuxSystem linuxSystem = new
LinuxSystemFake(LinuxSystem.INSTANCE.GENTOO.getReleaseFilePath(),
"Gentoo Base System release 2.0.1");
- assertEquals("Gentoo2.0.1", distro.getNameAndVersion());
+ assertEquals("Gentoo 2.0.1", linuxSystem.getDistroNameAndVersion());
}
@Test
public void canExtractCentOSVersion() {
- LinuxDistro distro = new LinuxDistroFake(LinuxSystem.CENTOS.getName(),
+ LinuxSystem linuxSystem = new
LinuxSystemFake(LinuxSystem.INSTANCE.CENTOS.getReleaseFilePath(),
"CentOS release 5.3 (Final)");
- assertEquals("CentOS5.3", distro.getNameAndVersion());
+ assertEquals("CentOS 5.3", linuxSystem.getDistroNameAndVersion());
}
}
-
Deleted:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxDistroFake.java
===================================================================
---
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxDistroFake.java 2010-10-01
08:59:37 UTC (rev 25383)
+++
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxDistroFake.java 2010-10-01
09:05:37 UTC (rev 25384)
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.usage.test.fakes;
-
-import java.io.IOException;
-
-import org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem.LinuxDistro;
-
-public class LinuxDistroFake extends LinuxDistro {
-
- private String releaseFileContent;
-
- public LinuxDistroFake(String name, String releaseFileContent) {
- super(name, "dummy");
- this.releaseFileContent = releaseFileContent;
- }
-
- @Override
- protected String getDistroFileContent(String filePath) throws IOException {
- return releaseFileContent;
- }
-}
\ No newline at end of file
Added:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java
===================================================================
---
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java
(rev 0)
+++
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java 2010-10-01
09:05:37 UTC (rev 25384)
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.usage.test.fakes;
+
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+import java.io.IOException;
+
+import org.jboss.tools.usage.googleanalytics.eclipse.LinuxSystem;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class LinuxSystemFake extends LinuxSystem {
+
+ private String releaseFilePath;
+
+ private String releaseFileContent;
+
+ public LinuxSystemFake(String releaseFilePath, String releaseFileContent) {
+ super();
+ this.releaseFilePath = releaseFilePath;
+ this.releaseFileContent = releaseFileContent;
+ }
+
+ @Override
+ protected boolean exists(String releaseFilePath) {
+ return this.releaseFilePath.equals(releaseFilePath);
+ }
+
+ @Override
+ protected String getDistroFileContent(String filePath) throws IOException {
+ return releaseFileContent;
+ }
+}
\ No newline at end of file
Property changes on:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/LinuxSystemFake.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/ReportingEclipseEnvironmentFake.java
===================================================================
---
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/ReportingEclipseEnvironmentFake.java 2010-10-01
08:59:37 UTC (rev 25383)
+++
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/fakes/ReportingEclipseEnvironmentFake.java 2010-10-01
09:05:37 UTC (rev 25384)
@@ -70,6 +70,6 @@
@Override
protected String getLinuxDistroNameAndVersion() {
- return new LinuxDistroFake(LinuxSystem.FEDORA.getName(), "Fedora release 13
(Goddard)").getNameAndVersion();
+ return new LinuxSystemFake(LinuxSystem.INSTANCE.FEDORA.getName(), "Fedora release
13 (Goddard)").getDistroNameAndVersion();
}
}