From 3e5a7a6f522d949f623bbb9ee8ded8b7eaab385e Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 30 Jul 2010 21:13:16 +0000 Subject: [PATCH] o Deleted broken IT that is now superseded by IT for MNG-4745 git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@980968 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/it/IntegrationTestSuite.java | 1 - .../it/MavenIT0109ReleaseUpdateTest.java | 140 ------------------ .../src/test/resources/it0109/pom.xml | 47 ------ .../1.0/maven-it-release-update-1.0.jar | Bin 3684 -> 0 bytes .../1.1/maven-it-release-update-1.1.jar | Bin 3686 -> 0 bytes 5 files changed, 188 deletions(-) delete mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java delete mode 100644 its/core-it-suite/src/test/resources/it0109/pom.xml delete mode 100644 its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar delete mode 100644 its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index cb4bd9ee0b..4020f3c50b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -79,7 +79,6 @@ public class IntegrationTestSuite // ------------------------------------------------------------------------------------------------------------- // Tests that don't run stable and need to be fixed // ------------------------------------------------------------------------------------------------------------- - // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 suite.addTestSuite( MavenITmng4745PluginVersionUpdateTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java deleted file mode 100644 index dacec64289..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java +++ /dev/null @@ -1,140 +0,0 @@ -package org.apache.maven.it; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.FileUtils; -import org.apache.maven.it.util.ResourceExtractor; - -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -/** - * Test to verify that a release can be updated. - */ -public class MavenIT0109ReleaseUpdateTest - extends AbstractMavenIntegrationTestCase -{ - public MavenIT0109ReleaseUpdateTest() - { - super( ALL_MAVEN_VERSIONS ); - } - - private static final String GROUPID = "org.apache.maven.it"; - - private static final String ARTIFACTID = "maven-it-release-update"; - - private static final String TYPE = "jar"; - - private static final String POM_TYPE = "pom"; - - private static final String OLD_VERSION = "1.0"; - - private static final String NEW_VERSION = "1.1"; - - public void testReleaseUpdated() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0109" ); - Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( GROUPID, ARTIFACTID, OLD_VERSION, TYPE ); - verifier.deleteArtifact( GROUPID, ARTIFACTID, OLD_VERSION, POM_TYPE ); - verifier.deleteArtifact( GROUPID, ARTIFACTID, NEW_VERSION, TYPE ); - verifier.deleteArtifact( GROUPID, ARTIFACTID, NEW_VERSION, POM_TYPE ); - - writeMetadata( new File( verifier.localRepo ), "maven-metadata-it.releases.xml", OLD_VERSION, - "20051230031110" ); - - // create a repository (TODO: into verifier) - File repository = new File( testDir, "repo" ); - repository.mkdirs(); - - // create artifact in repository (TODO: into verifier) - writeArtifact( repository, OLD_VERSION ); - writeArtifact( repository, NEW_VERSION ); - - writeMetadata( repository, "maven-metadata.xml", NEW_VERSION, "20061230031110" ); - - verifier.assertArtifactNotPresent( GROUPID, ARTIFACTID, OLD_VERSION, TYPE ); - verifier.assertArtifactNotPresent( GROUPID, ARTIFACTID, NEW_VERSION, TYPE ); - - Map m = new HashMap(); -/* - m.put( "MAVEN_OPTS", - "-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" ); -*/ - verifier.executeGoal( "package", m ); - - verifier.assertArtifactNotPresent( GROUPID, ARTIFACTID, OLD_VERSION, TYPE ); - verifier.assertArtifactPresent( GROUPID, ARTIFACTID, NEW_VERSION, TYPE ); - - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - } - - private static void writeMetadata( File repository, String fileName, String version, String timestamp ) - throws IOException - { - File metadata = new File( repository, GROUPID.replace( '.', '/' ) + "/" + ARTIFACTID + "/" + fileName ); - metadata.getParentFile().mkdirs(); - - StringBuffer content = new StringBuffer(); - content.append( "\n" ); - content.append( " " + GROUPID + "\n" ); - content.append( " " + ARTIFACTID + "\n" ); - content.append( " \n" ); - content.append( " " + version + "\n" ); - content.append( " " + version + "\n" ); - content.append( " \n" ); - content.append( " " + OLD_VERSION + "\n" ); - content.append( " " + NEW_VERSION + "\n" ); - content.append( " \n" ); - content.append( " " + timestamp + "\n" ); - content.append( " \n" ); - content.append( "" ); - - FileUtils.fileWrite( metadata.getAbsolutePath(), content.toString() ); - } - - private static void writeArtifact( File repository, String version ) - throws IOException - { -/* - File artifact = new File( repository, GROUPID.replace( '.', '/' ) + "/" + ARTIFACTID + "/" + version + "/" + - ARTIFACTID + "-" + version + "." + TYPE ); - artifact.getParentFile().mkdirs(); - FileUtils.fileWrite( artifact.getAbsolutePath(), version ); - - StringBuffer content = new StringBuffer(); - content.append( "\n" ); - content.append( " 4.0.0\n" ); - content.append( " " + GROUPID + "\n" ); - content.append( " " + ARTIFACTID + "\n" ); - content.append( " " + version + "\n" ); - content.append( " maven-plugin\n" ); - content.append( "" ); - - artifact = new File( artifact.getParentFile(), ARTIFACTID + "-" + version + "." + POM_TYPE ); - FileUtils.fileWrite( artifact.getAbsolutePath(), content.toString() ); -*/ - } -} diff --git a/its/core-it-suite/src/test/resources/it0109/pom.xml b/its/core-it-suite/src/test/resources/it0109/pom.xml deleted file mode 100644 index c0b79545f4..0000000000 --- a/its/core-it-suite/src/test/resources/it0109/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - Maven Integration Test :: releaseUpdate - org.apache.maven.its.releaseUpdate - maven-it-release-update - 1.0 - - Test to verify that a plugin can be successfully updated to the latest release. See MNG-1908. - - - - - org.apache.maven.it - maven-it-release-update - - - - - - it.releases - file:///${basedir}/repo - - always - - - - diff --git a/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar b/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar deleted file mode 100644 index ddb569a83acaab5eaa4f798d06258b6189f71766..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3684 zcmbtX4LFnQ8=p3xOC=wLeAKi$wXKOJImwh^j7=NSRBMfVkCA*vaVnAynohEOtWdtH zzpq0Yg;6LW%0WtU5|PTc|2txxIGuA{=ic?c?{i)6egE$JexCRFJ--pnzz`{rz{Zwn zU}gqiZ<4^1U_{0uO)YR+h+o|#K%;aCMW~#8PMqt7-s}EigJKRP)DkLat}f6_T|g=G zwj3DEm+wY9#&Dl+VxcnxaQ5(W{DBAbs|SrqqaS7bz)|L}j{lTdFnxl|UvX#MoxJB0 z%uaYY?VFVR?P-=6W%%_Ix9HY1P2ETvLRLa^dMUkEOyM zL^KUS+8f=pxTee)n(-Om4U>HH=ZY5!$<-aZUfg>1i=IjVv#UP*{5a8aJmR%UFDkQAp9?X_9VR~)@~e=x{-t%7Qxy0;OVTUK3%Do(diPC zyT`Z|zolM8gIyRW@&>>^|GHD-aF$n2f3KrA`(%e>wO3{GfMkFKd#mln@k5=g2n_O6F?G z#-1TC=CSqz=Q-|AA=?6ipmAc^yChGOU0m)N>ohSV`BNhiTip@OCYfmAeqHGuivL7hP+{wZ5S%k?I^Wjx_IgEuc5KuXd$` ztcu#qYG<44jvZ{4$#%5~7nvUP)i6FrIlR_hjAHjRLw{voo3DL(zRmPhDPsCS$!Irw z`kLQad;uY0GMJSg>8)EE)p(_Q!x7ujPu)I8?X<0u9lKCXw@PYG%x{m`uV}=|sAC5h z1WE_KBK5!d?g)Ma4`&Y)-Ic~-1(EG7m5t?g(p_^}5!~%z3i!PZ+$hbK7hI>rP6wQ_1TKZ=hgD@P~3sdPi zxQ=K{^hq~UTI)wf9*Y?NvfkpZsmA_g)U=}BFb+rUlxg0(JkiRB*h0D_v?By%=|(v*+(U~(|aj|?;a>Fo#GdOYH zpHac1LoIWi57n0MsDxxwnPQ<`MO*)OIZ>s)z~{hbk_=yO{pz#j+A1fi+KI_M0|*}_ zX~m%rn`x`VWZgHa7#&Y33xgvj&fLbxLn)2k&X%H;`qY5X1htyCw7Xe`RTNDma{1kS zXJf(#Xqx!=iv#@LsJ8LyDNKb^T2staK5y8FREPE4=2-XG<+S_WLJSObH10xzK5uy6bES2SXcf6sd=PG@nnp10^a;eeR6wZr<4H-95wdoO<_lq1 z1b;eokKc{R(vDwWUI+{hYiuTC{y0UFX@VWezaH>5N8xra>QQ;eK7_Yt?>5!Am>kc7 zxSz{;%`##I{)Ja2xsl1esN42bMZ#zFM1EWfFG4iK%3u4_XX)6Y+Mc)idy6Z5UHgwu zT+C>E5>hp~COGoVpl5J7+Ksf!nOb~m?TsqW=o>5DY3%0=9Cf`NtKp{(bJ z+n$I(QX+1H)iYcshNxZAH6#wsD?oeVv}%=1)H`0*P~h2)hkxAM+;_Ax{1zE)vdXk; zQ$C!pSDoH%)uxFm!a>$5W5xrorlw{zlt-y2W+nxJ-KbyIX{(PIek5iwayU22^K^aB zy)Rlna%EV(iG70TV86P`Gr{R-s1o0wLV`jpS0C(p9@KC-a*Uk(yxj;g{U=As!kyjT zfxZPlD*nu2{k3PYR+yMh&{)KQf{KgEGJUbCHw;444baOfp?iBbOX>7`dBzz`>6%lu zQX}fOtQ`3makI4)72bn$*LCsN3`i|Xl=ZxSUukDj_oHw#Ww^YY!nvF0JEq4H9=v4t zGhQtxBT7Z)w2j1!G>ajZg1vzy3IZ;Qi;M!m7`aH2F4@8IkNd# z>*W09NN=ly54kmCl1y9Rq9;5)?Eq^v8J*nd=s7ad$xDEwS6=Ik0yl`9{r&p;^V>KB zFwC9}EqiR#b|2h-(w1&&^UOFAxq+i_Yv5q{*wW0_U4AviQ(CX?ko+Wb4&%MXSC$gZ zM3%^b|6X?j{Q diff --git a/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar b/its/core-it-suite/src/test/resources/it0109/repo/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar deleted file mode 100644 index d229c2a0acca9d39e67eb694577e27df4b1b1432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3686 zcmbtX3p|r+7+;1+t7MT}v#3tCLvl+l(=nMATcct+7IVK2DMTxm!a7cdgq2x|Lv(Q~ z#7@j5ltYJ7q}&dLjD$Gfh$-rv->+xC@B7~0?|YvA^E~hSz5n+=b5k(?DiGIpg12bQ z4nE(6fhWcYkA#~XK>cj~*-Z$f3b=Je8e$xP*FnGqUF?QI9xy=}9mFFrs1eMg+Wn?* z#1n`q{HOXy4R>%VO==xoWMy=Hm9i<^P-x{FrX@{$N7f!KJ`jj500Kz@5ew@w=kMj_=jiN#IN|OVN2|Ngq_UblI0L@{Z6j;&ghjx+xlgx^h}ScN@HMGYM`er{+`zsiBE%@{dIkLae{ zDNc-C-|HBW5+J6@fIbzrr295Lm*CfpTyxj#k!7-~+SP+56J7xi*D%&76l$gZ9e!S} z&mh<;yPs4fdw@TZeE0%cgO)u>Tix7%tWLd**I?e!B-S(B_m4xTlUH)R2#Okr(EvtEL>ZZ zDLLH`n0RU+rW<+KczsEZu2F(`GW@;vkdyiaCsrd}3f#6Qh2B_q9dEtM__6JTkZvSc znsR4kjLh*(Qo7OFZ|&vWF%g^F>w@9vKFbKV{$-42|KoHI$U*DL5l}F^My)FCMajq zq3&XMBAN3b3r4^m3R^KV?7zkMxW%!}Hi8xx`|xry18x2`H}Vh7OqVLp94($CCCpqq zNktc6l0F6d%mWShw%= z1Z?{TQ40&_l4xT2fK|V@;WT>2fDW_B$1}UL*M7oUGz_dqpMFCeY}59sPtoyzSFb-a z{ZV4Vyi83DR`ucaPuKS|RkAVV2C87|`|XQ(puY>WO|Zf7Vjj)#6R}-?|T5<82s~JJ*nyT z`!1hkysGR*Jr=gf5avthghW|65TSPBdKHf1vd5}fFlFJx>9AECLcd|k{0D)k6~lq9*DUSdhMA=^R~4qsc6 z?_!J@5=mb<`TS^AAGK}rElw|KF#26$s+uwtQo6Tu=X;l5T_XOza$l>eMF$CYIdXGf zPsc9<8fP^soYR{xPUn|#jIi}cZ*|A|$F8Hg(-65dNBlZi@wv8>vXUP~#`MFc+W(GC zDy)AH$bZ_vP;*NO|EaO9Z+ntkr3Kjd(v`zXRB(vKN9o|G?qTm>mWn%8--U4h?B-0i_ivf&J&5toNGO7$6|u>WVS&2D<`b7B zC1MXr7O<-NTZ|!kbkwyYUBjl>)Y4fj4etS#2yZoogiQn&rYG99#*C!_SyCP}v5S1k9`<9p39NX+? z$J(B(;AceM2Fqu-PQ52|LTa#d6ghC$RD>*Bl-ggG{XXb?d+m!qTnC&g!*1bK_DPs@ z?#@@L(y6}Dg=@QoC_?dXmeQCEx{{Wb(a6e{PszG^3hds-QCKZMZa89|P0FEXvZ&f- z(XWdX#|a$y=J*hEhZm|hUu*pJm`^=sG?O7NL{}-TpiVN?B}Oy$=9TD(PW=(+qE&Q+ zp;-Rs!^>A?2+!kaN6pZ!`_6!Sbpl?9AKIzVBB6_?@L?&o($Nyv8xKJ}-jGGn@-zHm zIf>Ycp7Z?EK^1W!zg3^I5pJNik)LvojiG#WwswX`s0UoSCR-D3A`m9<`rhjg52lrR zVy*?Yj)ONudCrR)p;>L#v;%D82dvR4;4=B~weli+dXdP!&LkfhDsmM|WgTd6GBS)V zmfx%Z4S-^Y?DcasT%~eNT9gDrJV$qf)tZgYY;*J;pXx}_6gG$WluNB-!q)p?p37M6 z(HC?(cOdutO}+5aeD(dCOz+*(`^R2;SS!jVSh!y;*I}kpb#S5~x&hS%FOJ+^{nm7x z&)jqc9~As;Yfo`d%eQuOU2cgyg*(h5)}7U_npJZt;HsoewLg