From 075134d7d07d79ece8ec947402e8d2c3a2b4c4ac Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Fri, 2 Mar 2018 18:01:49 +0530
Subject: [PATCH] IVY-1576 make the test a bit more robust to make sure the
 artifact content is the right one for the dependency

---
 .../org/apache/ivy/core/resolve/ResolveTest.java  |  12 ++++++++++++
 .../1.0/test-classified-1.0-asl.jar               | Bin 3 -> 454 bytes
 .../1.0/test-classified-1.0-other.jar             | Bin 2 -> 460 bytes
 .../1.0/test-classified-1.0-unix.jar              | Bin 2 -> 457 bytes
 4 files changed, 12 insertions(+)

diff --git a/test/java/org/apache/ivy/core/resolve/ResolveTest.java b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
index f3bf74f3..dce0ecd7 100644
--- a/test/java/org/apache/ivy/core/resolve/ResolveTest.java
+++ b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
@@ -62,6 +62,7 @@ import org.xml.sax.helpers.DefaultHandler;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import java.io.File;
+import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -73,6 +74,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 
 import static org.apache.ivy.util.StringUtils.joinArray;
 import static org.junit.Assert.assertEquals;
@@ -6315,7 +6318,16 @@ public class ResolveTest {
             final String classifier = artifact.getExtraAttribute("m:classifier");
             assertNotNull("No classifier extra attribute on artifact for dependency " + dependencyId, classifier);
             assertTrue("Unexpected classifier " + classifier + " on artifact " + artifact, classifiers.remove(classifier));
+            // just make sure it's the correct jar file
+            assertJarContains(adr.getLocalFile(), classifier + ".txt");
         }
         assertTrue("Missing artifact(s) with classifiers " + classifiers, classifiers.isEmpty());
     }
+
+    private void assertJarContains(final File jar, final String jarEntryPath) throws IOException {
+        try (final JarFile jarFile = new JarFile(jar)) {
+            final JarEntry entry = jarFile.getJarEntry(jarEntryPath);
+            assertNotNull(jarEntryPath + " is missing from jar file " + jar, entry);
+        }
+    }
 }
diff --git a/test/repositories/m2/org/apache/test-classified/1.0/test-classified-1.0-asl.jar b/test/repositories/m2/org/apache/test-classified/1.0/test-classified-1.0-asl.jar
index 56f3b36e2773a56fe267643b6b1678e06c9584eb..d7088aed4e970c0404d57eff2878573fb11d2f21 100644
GIT binary patch
literal 454
zcmWIWW@Zs#;Nak3NbXPaVL$?$3@i-3t|5-Po_=on|4uP5Ff#;rvvYt{FhP|C;M6Pv
zQ~}rQ>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48Bt5`TA
zUPvC1o+YK3@k3ly?fDWdi|68^PsCNHF<j05RP?ck5$uY*T`Ej2Ks#K47~zT-G%v6N
zWfO~Y^hzp9ymih!WCCkF7V_mT8&HA;td)^TgaOt6FwcSfj|$)(0)<9^H>y@-7lC|_
t0JcCTTq{yoAe#VkIkLk*E=PdFKqk~50p6@2#{(mSnPC%<{s-bP005FQRzd&(

literal 3
KcmY%3<pKZzhX6PL

diff --git a/test/repositories/m2/org/apache/test-classified/1.0/test-classified-1.0-other.jar b/test/repositories/m2/org/apache/test-classified/1.0/test-classified-1.0-other.jar
index 8d1c8b69c3fce7bea45c73efd06983e3c419a92f..36f87e458718b1cf962f11d96c05c47b8c082989 100644
GIT binary patch
literal 460
zcmWIWW@Zs#;Nak3V49HR!+-=h8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1g<Oz^PdT
zr~<Cp*U`_@%{4eg&)4m<@0rs+-nx1hdA)VD&Yd~GImqCO@q?#DdS1Rdp1v1LSFvzL
zypTL1JxfY6<A=Da+Vdq^7SF{+pNOkYW4N0Aspw-7BiI#ryHuE5fOfb7F~Swq{pem`
zV8}1YNG;MUsVF(Ef6_zu5femvT>>Y_Cv0Htj7%a7s9^x}ASet_0o+rd5DD-`)r#yY
xPzWG^EszP<iWDBmCV*U@hvYC$gmxh7Fc8E265!1Wayl?dm>ISJX(mPx4*-c>Q=b3;

literal 2
JcmY%30ssI^04o3h

diff --git a/test/repositories/m2/org/apache/test-classified/1.0/test-classified-1.0-unix.jar b/test/repositories/m2/org/apache/test-classified/1.0/test-classified-1.0-unix.jar
index 8d1c8b69c3fce7bea45c73efd06983e3c419a92f..ba256c49ad6ce553fd97d9ea7fb11df1b4674a99 100644
GIT binary patch
literal 457
zcmWIWW@Zs#;Nak32<cDqVL$?$3@i-3t|5-Po_=on|4uP5Ff#;rvvYt{FhP|C;M6Pv
zQ~}rQ>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48Bt5`TA
zUPvC1o+YK3@k3ly?fDWdi|68^PsCNHF<j05RP?ck5$uY*T`Ej2Ks#K47~u+EG%tW0
zTbh?yp;uB-qJ8%Cng>i^&38ZD$zcadv4S--GKnyth5*capb$U>a4&(vBfuL~E3%tF
t{zm{?AQP??DKwBx0J$C6Vc>v<8*v!Og83xCo0SbD!3>0(K@3I^0RXCnS9<^e

literal 2
JcmY%30ssI^04o3h