Commit test cases for Bug 364929. Signed-off-by: Mengxin Zhu <kane.zhu@windriver.com>
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/StatsTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/StatsTest.java new file mode 100644 index 0000000..d0e3c7a --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/StatsTest.java
@@ -0,0 +1,176 @@ +/******************************************************************************* + * Copyright (c) 2011 WindRiver Corporation and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * WindRiver Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.equinox.p2.tests.artifact.repository; + +import java.io.*; +import java.net.URI; +import java.util.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.equinox.internal.p2.artifact.repository.MirrorRequest; +import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository; +import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.p2.engine.Profile; +import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; +import org.eclipse.equinox.internal.p2.repository.AuthenticationFailedException; +import org.eclipse.equinox.internal.p2.repository.Transport; +import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.p2.planner.IPlanner; +import org.eclipse.equinox.p2.query.QueryUtil; +import org.eclipse.equinox.p2.repository.IRepository; +import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor; +import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager; +import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor; +import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository; +import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager; +import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; +import org.eclipse.equinox.p2.tests.testserver.helper.AbstractTestServerClientCase; +import org.eclipse.equinox.spi.p2.publisher.PublisherHelper; + +public class StatsTest extends AbstractTestServerClientCase { + + private File repositoryFile; + private URI repositoryURI; + private SimpleArtifactRepository sourceRepo; + private File targetLocation; + private SimpleArtifactRepository targetRepository; + private URI statsURL; + private IMetadataRepository metaRepo; + private File testInstall; + + @Override + public void setUp() throws Exception { + super.setUp(); + IArtifactRepositoryManager artifactRepositoryManager = (IArtifactRepositoryManager) getAgent().getService(IArtifactRepositoryManager.SERVICE_NAME); + String tempDir = System.getProperty("java.io.tmpdir"); + repositoryFile = new File(tempDir, "SimpleArtifactRepositoryTest"); + AbstractProvisioningTest.delete(repositoryFile); + repositoryURI = repositoryFile.toURI(); + Map properties = new HashMap(); + properties.put(IRepository.PROP_COMPRESSED, "true"); + statsURL = URI.create(getBaseURL() + "/stats"); + properties.put("p2.statsURI", statsURL.toString()); + sourceRepo = (SimpleArtifactRepository) artifactRepositoryManager.createRepository(repositoryURI, "artifact name", IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties); + + IArtifactDescriptor[] descriptors = new IArtifactDescriptor[2]; + IArtifactKey key = PublisherHelper.createBinaryArtifactKey("testKeyId", Version.create("1.2.3")); + descriptors[0] = PublisherHelper.createArtifactDescriptor(key, null); + ((ArtifactDescriptor) descriptors[0]).setProperty("download.stats", "testKeyId"); + key = PublisherHelper.createBinaryArtifactKey("testKeyId2", Version.create("1.2.3")); + descriptors[1] = PublisherHelper.createArtifactDescriptor(key, null); + ((ArtifactDescriptor) descriptors[1]).setProperty("download.stats", "testKeyId2"); + sourceRepo.addDescriptors(descriptors, null); + + IMetadataRepositoryManager manager = (IMetadataRepositoryManager) getAgent().getService(IMetadataRepositoryManager.SERVICE_NAME); + properties = new HashMap(); + properties.put(IRepository.PROP_COMPRESSED, "true"); + metaRepo = manager.createRepository(repositoryURI, "TestRepo", IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties); + + InstallableUnitDescription descriptor = new MetadataFactory.InstallableUnitDescription(); + descriptor.setId("testIuId"); + descriptor.setVersion(Version.create("1.0.0")); + descriptor.setArtifacts(new IArtifactKey[] {key}); + Collection providedCaps = new ArrayList(); + providedCaps.add(MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, descriptor.getId(), descriptor.getVersion())); + descriptor.addProvidedCapabilities(providedCaps); + descriptor.setMetaRequirements(new IRequirement[] {MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, descriptor.getId(), new VersionRange(descriptor.getVersion(), true, Version.MAX_VERSION, false), null, false, false)}); + descriptor.setTouchpointType(PublisherHelper.TOUCHPOINT_NATIVE); + IInstallableUnit iu = MetadataFactory.createInstallableUnit(descriptor); + metaRepo.addInstallableUnits(Arrays.asList(iu)); + + for (int i = 0; i < descriptors.length; i++) { + File artifactFile = new File(sourceRepo.getLocation(descriptors[i])); + artifactFile.getParentFile().mkdirs(); + assertTrue("Failed to create binary artifact file.", artifactFile.createNewFile()); + } + + targetLocation = File.createTempFile("target", ".repo"); + AbstractProvisioningTest.delete(targetLocation); + targetLocation.mkdirs(); + targetRepository = new SimpleArtifactRepository(getAgent(), "TargetRepo", targetLocation.toURI(), null); + } + + @Override + public void tearDown() throws Exception { + super.tearDown(); + //repository location is not used by all tests + if (repositoryURI != null) { + ((IArtifactRepositoryManager) getAgent().getService(IArtifactRepositoryManager.SERVICE_NAME)).removeRepository(repositoryURI); + ((IMetadataRepositoryManager) getAgent().getService(IMetadataRepositoryManager.SERVICE_NAME)).removeRepository(repositoryURI); + repositoryURI = null; + } + if (repositoryFile != null) { + AbstractProvisioningTest.delete(repositoryFile); + repositoryFile = null; + } + if (targetLocation != null) { + ((IArtifactRepositoryManager) getAgent().getService(IArtifactRepositoryManager.SERVICE_NAME)).removeRepository(targetLocation.toURI()); + AbstractProvisioningTest.delete(targetLocation); + targetLocation = null; + } + if (testInstall != null) { + AbstractProvisioningTest.delete(testInstall); + testInstall = null; + } + } + + public void testCustomizedDownloadStats() throws CoreException, IOException { + IArtifactKey key = new ArtifactKey(PublisherHelper.BINARY_ARTIFACT_CLASSIFIER, "testKeyId", Version.parseVersion("1.2.3")); + MirrorRequest request = new MirrorRequest(key, targetRepository, null, null, (Transport) getAgent().getService(Transport.SERVICE_NAME), "package=test"); + request.perform(sourceRepo, new NullProgressMonitor()); + assertTrue("Failed on mirroring artifact.", request.getResult().isOK()); + + checkStatsResult("test download number: 1"); + } + + protected void checkStatsResult(final String checkpoint) throws FileNotFoundException, CoreException, AuthenticationFailedException, IOException { + final Transport transport = (Transport) getAgent().getService(Transport.SERVICE_NAME); + BufferedReader statsResult = new BufferedReader(new InputStreamReader(transport.stream(statsURL, null))); + try { + String line = statsResult.readLine(); + while (line != null) { + if (line.startsWith(checkpoint)) + return; + line = statsResult.readLine(); + } + fail("Didn't get expected stats result."); + } finally { + statsResult.close(); + } + } + + public void testDownloadStatsWhileInstall() throws AuthenticationFailedException, FileNotFoundException, CoreException, IOException { + IProfileRegistry registry = (IProfileRegistry) getAgent().getService(IProfileRegistry.SERVICE_NAME); + final String profileName = "downloadStats"; + Map properties = new HashMap(); + properties.put(IProfile.PROP_STATS_PARAMETERS, "os=linux&ws=gtk&package=jee"); + String tempDir = System.getProperty("java.io.tmpdir"); + testInstall = new File(tempDir, "statsTestInstall"); + testInstall.mkdirs(); + properties.put(IProfile.PROP_INSTALL_FOLDER, testInstall.toString()); + Profile profile = (Profile) registry.addProfile(profileName, properties); + ProfileChangeRequest req = new ProfileChangeRequest(profile); + req.addInstallableUnits(metaRepo.query(QueryUtil.ALL_UNITS, null).toArray(IInstallableUnit.class)); + IPlanner planner = (IPlanner) getAgent().getService(IPlanner.SERVICE_NAME); + ProvisioningContext context = new ProvisioningContext(getAgent()); + context.setArtifactRepositories(new URI[] {repositoryURI}); + context.setMetadataRepositories(new URI[] {repositoryURI}); + IProvisioningPlan plan = planner.getProvisioningPlan(req, context, null); + IEngine engine = (IEngine) getAgent().getService(IEngine.SERVICE_NAME); + assertTrue("Failed on install test iu.", engine.perform(plan, null).isOK()); + profile = (Profile) registry.getProfile(profileName); + assertEquals("Didn't install iu.", 1, profile.query(QueryUtil.ALL_UNITS, null).toUnmodifiableSet().size()); + registry.removeProfile(profileName); + checkStatsResult("jee download number: 1"); + } +}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/AllTestServerTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/AllTestServerTests.java index e551009..e7953f1 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/AllTestServerTests.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/AllTestServerTests.java
@@ -14,6 +14,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.equinox.p2.tests.artifact.repository.MirrorRequestTest2; +import org.eclipse.equinox.p2.tests.artifact.repository.StatsTest; import org.eclipse.equinox.p2.tests.testserver.helper.AbstractTestServerSuite; public class AllTestServerTests extends AbstractTestServerSuite { @@ -35,6 +36,7 @@ suite.addTestSuite(FileReaderTest.class); suite.addTestSuite(NTLMTest.class); suite.addTestSuite(MirrorRequestTest2.class); + suite.addTestSuite(StatsTest.class); suite.addTest(new AbstractTestServerSuite("stopServer")); }
diff --git a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java index 90cbd16..1222691 100644 --- a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java +++ b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/Activator.java
@@ -20,6 +20,7 @@ import org.eclipse.equinox.p2.testserver.servlets.IntermittentTimeout; import org.eclipse.equinox.p2.testserver.servlets.LastModifiedLier; import org.eclipse.equinox.p2.testserver.servlets.Redirector; +import org.eclipse.equinox.p2.testserver.servlets.Stats; import org.eclipse.equinox.p2.testserver.servlets.StatusCodeResponse; import org.eclipse.equinox.p2.testserver.servlets.TimeOut; import org.eclipse.equinox.p2.testserver.servlets.Truncator; @@ -88,6 +89,7 @@ httpService.registerServlet("/proxy3/aprivate", new BasicResourceDelivery("/proxy3/aprivate", URI.create(SITE2)), null, artifactSecuredHttpContext); //$NON-NLS-1$//$NON-NLS-2$ httpService.registerServlet("/proxy4/aprivate", new BasicResourceDelivery("/proxy4/aprivate", URI.create(SITE3)), null, artifactSecuredHttpContext); //$NON-NLS-1$//$NON-NLS-2$ + httpService.registerServlet("/stats", new Stats(), null, null); //$NON-NLS-1$ } catch (NamespaceException e) { // TODO Auto-generated catch block @@ -147,6 +149,7 @@ httpService = (HttpService) service; httpService.unregister("/public"); //$NON-NLS-1$ httpService.unregister("/private"); //$NON-NLS-1$ + httpService.unregister("/stats"); //$NON-NLS-1$ } }
diff --git a/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/servlets/Stats.java b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/servlets/Stats.java new file mode 100644 index 0000000..222dd21 --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.testserver/src/org/eclipse/equinox/p2/testserver/servlets/Stats.java
@@ -0,0 +1,113 @@ +/******************************************************************************* + * Copyright (c) 2011, Wind River and others. + * All rights reserved. This program and the accompanying materials + * are 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: + * Wind River - initial API and implementation + *******************************************************************************/ +package org.eclipse.equinox.p2.testserver.servlets; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.TimeZone; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.eclipse.equinox.p2.testserver.HttpConstants; + +public class Stats extends HttpServlet { + + /** + * + */ + private static final long serialVersionUID = -3209768955270841029L; + private static final String UnkownPackage = "unkown"; //$NON-NLS-1$ + private static final String PACKAGE = "package"; //$NON-NLS-1$ + private Map downloadStats = new HashMap(); + + public Stats() { + downloadStats.put(UnkownPackage, new Integer(0)); + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { + responseHeaderAndStatus(response); + + final String result = getStatsResult(); + response.setContentLength(result.length()); + response.setContentType("text/plain"); //$NON-NLS-1$ + + BufferedReader reader = new BufferedReader(new StringReader(result)); + PrintWriter writer = response.getWriter(); + try { + writer.flush(); /* write the headers and unbuffer the output */ + char buffer[] = new char[4096]; + int read; + while ((read = reader.read(buffer, 0, buffer.length)) != -1) { + writer.write(buffer, 0, read); + } + } finally { + reader.close(); + writer.close(); + } + } + + private void responseHeaderAndStatus(HttpServletResponse response) { + // set when the resource was modified + DateFormat df = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); //$NON-NLS-1$ + // must always be GMT + df.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + response.setHeader(HttpConstants.LAST_MODIFIED, df.format(new Date())); + response.setStatus(HttpServletResponse.SC_OK); + } + + private String getStatsResult() { + StringBuffer sb = new StringBuffer(); + sb.append("It's a page to count the downloading times when heading this page with query 'package=<package name>'.\n"); //$NON-NLS-1$ + for (Iterator iter = downloadStats.keySet().iterator(); iter.hasNext();) { + String packageName = (String) iter.next(); + sb.append(packageName).append(" download number: ").append(downloadStats.get(packageName)).append("\n"); //$NON-NLS-1$//$NON-NLS-2$ + } + return sb.toString(); + } + + protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String queryString = request.getQueryString(); + + responseHeaderAndStatus(response); + + boolean found = false; + if (queryString != null) { + String[] parameters = queryString.split("&"); //$NON-NLS-1$ + for (int i = 0; i < parameters.length; i++) { + String[] paraPair = parameters[i].split("=", 2); //$NON-NLS-1$ + if (paraPair.length == 2 && PACKAGE.equals(paraPair[0])) { + found = true; + Integer count = (Integer) downloadStats.get(paraPair[1]); + if (count == null) { + count = new Integer(1); + } else + count = new Integer(1 + count.intValue()); + downloadStats.put(paraPair[1], count); + break; + } + } + } + if (!found) { + Integer count = (Integer) downloadStats.get(UnkownPackage); + downloadStats.put(UnkownPackage, new Integer(1 + count.intValue())); + } + } +}