From edf6aa2ced7ad060199b3b232cd6fa4eabfdaeec Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 14 Jan 2010 02:15:09 +0000 Subject: [PATCH] remove dependencies on artifact upload functionality, add test fixture data. Temporarily disable tests that don't work on Safari git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@899031 13f79535-47bb-0310-9956-ffa450edef68 --- .../internal/test/test/1.0/test-1.0.jar | Bin 0 -> 1981 bytes .../internal/test/test/1.0/test-1.0.jar.md5 | 1 + .../internal/test/test/1.0/test-1.0.jar.sha1 | 1 + .../internal/test/test/1.0/test-1.0.pom | 24 ++++++++++++++++++ .../internal/test/test/1.0/test-1.0.pom.md5 | 1 + .../internal/test/test/1.0/test-1.0.pom.sha1 | 1 + .../internal/test/test/maven-metadata.xml | 12 +++++++++ .../internal/test/test/maven-metadata.xml.md5 | 1 + .../test/test/maven-metadata.xml.sha1 | 1 + .../web/test/ArtifactManagementTest.java | 6 +++-- .../archiva/web/test/AuditLogsReportTest.java | 12 ++++++--- .../apache/archiva/web/test/BrowseTest.java | 1 + .../apache/archiva/web/test/ReportsTest.java | 6 +---- .../apache/archiva/web/test/SearchTest.java | 6 +---- 14 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar create mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5 create mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1 create mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom create mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5 create mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1 create mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml create mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5 create mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..d98bcfb34434b5ae8ff87c158fc99cf249413e55 GIT binary patch literal 1981 zcmWIWW@h1H0D*uWT^le1N^k;cU)K;vT~9wZ{Q#&k4hDaqvd^bI1JZ!fH9#zatjyQZ z&(qB{I7H9a?X&Nh(>~t1dKY=Ub+yi&Ilno`;EM5sr$stm=T7K&>pF3;KUoqsMNIpE zO2y7O-9f_MLBS<+wbqKra0^W~4ic>qJ{|NKDC1>Z>~-Lgr|U{pRe?s4*!5F#CcI3m zV*A+kY){Od7zUWTFrCi|bXQ4gaS4*sK|XwbY|1Y`Mg|6MCI$vRm=ec=0=?v%#Ny)I zKws~}4g$5e*ZU@I*}C;>bhLly1sU5A7QrLV0Sklp=WTl%v^{6iq&(L8X>uYqKbZdn zK2ljLvaou_@jWvuf2V!_{rod`q|D<3j*Qu6t5!rtly7MC?bGecZ96oRYpP}X2{V3c zo}H&x=u39(<9d2l<;AHVaV4gPsrIip?+R}8`Xo8i*gxycgCA~vz2$~dTRXU0xFoaA zy4P#WYhCVY@!^(Q*uw==?s@1uEpf;xA(HmQ3~=H}~8K7Lg1o5Y>$ zm8Bu|9Z7fd3*PKrvDoo#y_$qq@ypxq0=}KGU-j3>%xFRHVouRj!SY(4-koSs)DB`v zS-Pnq?ZIM|%Ucq*?#!?^nXr7jpC6mfN8gLf&M2p}{9Mex;rf<00Xj=mjtjY#-*VXD zlab7N^yY_5Ew?+;Mo-^Z7Zo$M3z+0xyb*K6jdOL&m;B81r{cIHhaWl7$xy!$vmUa_j>MEn`zG7 zE*`XLZ`s<1`nxxGSTmGZOgMRQp;d5REpz^Q_lk4fdv5qnZr6VO`-?^2&mU8s*@+&N ztCNf0*LsxCI5*;g#;x3Kw>K0%VA&thx@hfB{+(|Zce11${#^Yr?n(H%^3Vwy*3rSg zn{C=JuP$-m)YjoMz4z^1b}Z+{DFv^Un&ZB(YweuOt?*C|KZI(Uze5p~=-u%_<7ri=CWLBM=xbmciuS}!rmue=lLcP5gU)yxXxy(?%w(!!0 zv+sicS>9iNM}5}R((N3o%^qjdF@CMnj3?@Uvea$EKsEUQ~0G|kiLpL=8CzxkoF?P2MQ z16+1h6b7CN1;$`B5UUf4$%3N%g4Cjt%+%uGGXJyQx?Vb-zJVUALO%HFc%OY7#K-<= zkI-iko?cO&vuk^N*Yxm;#xy&N^ziWT?l=|H-DUjwa}MuUo*kFEKY4T81m}1Mb$jm+ z>h?0aEHv3Wp$1qiF*1oT<1SZ$&I1AghPRF&8mW|pX~SO5f)sTI0S&KivgCmaDT#bJj`Ou91P0y2+f_C zn$et&X#%JWK$x%_hY4uLU@sG31}$m)gwGgg34sU`?CBC=+8!2+Faf&l literal 0 HcmV?d00001 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5 new file mode 100644 index 000000000..7359be6f9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5 @@ -0,0 +1 @@ +ea7dea9244b2a0975cfa117dc34fe18e \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1 new file mode 100644 index 000000000..45ec67894 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1 @@ -0,0 +1 @@ +1039566ff5361d07eccd1243c45929b96441c7d6 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom new file mode 100644 index 000000000..cbec59866 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom @@ -0,0 +1,24 @@ + + 4.0.0 + test + test + jar + 1.0 + test + http://maven.apache.org + + + junit + junit + 3.8.1 + test + + + + + test +file://localhost/Users/brett/scm/archiva/archiva/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal + + + diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5 new file mode 100644 index 000000000..3b20276cd --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5 @@ -0,0 +1 @@ +f80c7c493716de649a99db00cd2ff34c \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1 new file mode 100644 index 000000000..d7c09225e --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1 @@ -0,0 +1 @@ +4b95c6fa09d1e02efdb69129f53f025e33bc8958 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml new file mode 100644 index 000000000..68287fd4e --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml @@ -0,0 +1,12 @@ + + + test + test + 1.0 + + + 1.0 + + 20100114015837 + + diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5 new file mode 100644 index 000000000..4bb9667e4 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5 @@ -0,0 +1 @@ +dab1b8c2475fe839f387ceaef0d82b30 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1 new file mode 100644 index 000000000..f00268387 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +4e5b414d5419121ef75131cb52235a9abbf2095a \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java index 21c6cd59f..1f60076bc 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java @@ -83,15 +83,16 @@ public class ArtifactManagementTest assertTextPresent( "Please add a file to upload." ); } + @Test( enabled = false ) public void testAddArtifactValidValues() { // TODO: disable test on non *chrome browsers, there is no way to do file uploads (SEL-63) - addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() ); + addArtifact( getGroupId() , "testAddArtifactValidValues", getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() ); assertTextPresent( "Artifact 'test:test:1.0' was successfully deployed to repository 'internal'" ); } //MRM-747 - @Test(dependsOnMethods = { "testAddArtifactValidValues" } ) + @Test( enabled = false ) public void testAddArtifactBlockRedeployments() { // TODO: disable test on non *chrome browsers, there is no way to do file uploads (SEL-63) @@ -99,6 +100,7 @@ public class ArtifactManagementTest assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." ); } + @Test( enabled = false ) public void testDeleteArtifact() { //prep diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java index bced43169..daedc24a9 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java @@ -67,7 +67,9 @@ public class AuditLogsReportTest assertTextPresent( "No audit logs found." ); } - @Test (dependsOnMethods = { "testAddArtifactValidValues" } ) + // TODO: add test for adding via WebDAV + // TODO: disable if not running on *chrome + @Test (dependsOnMethods = { "testAddArtifactValidValues" }, enabled = false ) public void testViewAuditLogsDataFound() { goToAuditLogReports(); @@ -86,7 +88,9 @@ public class AuditLogsReportTest assertTextPresent( "admin" ); } - @Test (dependsOnMethods = { "testViewAuditLogsDataFound" } ) + // TODO: add test for adding via WebDAV + // TODO: disable if not running on *chrome + @Test (dependsOnMethods = { "testAddArtifactValidValues" }, enabled = false ) public void testViewAuditLogsOnlyArtifactIdIsSpecified() { goToAuditLogReports(); @@ -105,7 +109,9 @@ public class AuditLogsReportTest assertTextPresent( "admin" ); } - @Test (dependsOnMethods = { "testViewAuditLogsOnlyArtifactIdIsSpecified" } ) + // TODO: add test for adding via WebDAV + // TODO: disable if not running on *chrome + @Test (dependsOnMethods = { "testAddArtifactValidValues" }, enabled = false ) public void testViewAuditLogsForAllRepositories() { goToAuditLogReports(); diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java index 8e539d472..c9c60ecce 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java @@ -45,6 +45,7 @@ public class BrowseTest } // MRM-1278 + @Test( enabled = false ) public void testCorrectRepositoryInBrowse() { File artifact = diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java index d46c16907..756763fec 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java @@ -22,13 +22,12 @@ package org.apache.archiva.web.test; import org.apache.archiva.web.test.parent.AbstractArtifactReportsTest; import org.testng.annotations.Test; -@Test( groups = { "reports" }, dependsOnMethods = { "testAddArtifactValidValues" } ) +@Test( groups = { "reports" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } ) public class ReportsTest extends AbstractArtifactReportsTest { //TODO Tests for repository with defects -// @Test(dependsOnMethods = { "testAddArtifactValidValues" } ) public void testRepoStatisticsWithoutRepoCompared() { goToReportsPage(); @@ -57,7 +56,6 @@ public class ReportsTest assertTextPresent( "Start Date must be earlier than the End Date" ); } - @Test(dependsOnMethods = { "testAddArtifactValidValues" } ) public void testRepositoryStatistics() { String repositoryName = getProperty( "REPOSITORY_NAME" ) ; @@ -78,7 +76,6 @@ public class ReportsTest assertTextPresent( "Statistics Report" ); } - @Test(dependsOnMethods = { "testAddArtifactValidValues" } ) public void testRepositoryHealthWithoutDefect() { goToReportsPage(); @@ -89,7 +86,6 @@ public class ReportsTest assertTextPresent( "The operation generated an empty report." ); } - @Test(dependsOnMethods = { "testAddArtifactValidValues" } ) public void testRepositoryHealthWithoutGroupId() { goToReportsPage(); diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java index df9bb228c..163e6ae45 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java @@ -34,7 +34,6 @@ public class SearchTest assertTextPresent( "No results found" ); } - @Test (dependsOnMethods = { "testAddArtifactValidValues" } ) public void testSearchExistingArtifact() { searchForArtifact( getProperty( "ARTIFACT_ARTIFACTID" ) ); @@ -43,7 +42,6 @@ public class SearchTest assertLinkPresent( "test" ); } - @Test (dependsOnMethods = { "testAddArtifactValidValues" } ) public void testViewSearchedArtifact() { searchForArtifact( getProperty( "ARTIFACT_ARTIFACTID" ) ); @@ -66,7 +64,6 @@ public class SearchTest assertTextPresent( "Advanced Search - At least one search criteria must be provided." ); } - @Test (dependsOnMethods = { "testAddArtifactValidValues" } ) public void testSearchExistingArtifactUsingAdvancedSearchArtifactId() { searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, getProperty( "REPOSITORYID" ), null, null ); @@ -75,7 +72,6 @@ public class SearchTest assertLinkPresent( "test" ); } - @Test (dependsOnMethods = { "testAddArtifactValidValues" } ) public void testSearchExistingArtifactUsingAdvancedSearchGroupId() { searchForArtifactAdvancedSearch( getProperty( "GROUPID" ), null, null, getProperty( "REPOSITORYID" ), null, null ); @@ -84,7 +80,7 @@ public class SearchTest assertLinkPresent( "test" ); } - @Test (dependsOnMethods = { "testAddManagedRepoValidValues", "testAddArtifactValidValues" } ) + @Test (dependsOnMethods = { "testAddManagedRepoValidValues" } ) public void testSearchExistingArtifactUsingAdvancedSearchNoAccessToRepository() { searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, "managedrepo1", null, null );