568417: Build changes for migration of MAT JIPP to new CI infrastructure

Reenable tests

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=568417

Change-Id: I5aa21a29f1ad49647453f9bbb57ba8d44d0ac070

3 files changed, 14 insertions, 11 deletions

diff --git a/parent/pom.xml b/parent/pom.xml
index 99d4f6ab..bc548355 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -270,7 +270,7 @@
 					<artifactId>tycho-surefire-plugin</artifactId>

 					<version>${tycho-version}</version>

 					<configuration>

-						<argLine>-ea -Xmx1024m</argLine>

+						<argLine>-ea -Xmx1280m</argLine>

 						<!-- <testFailureIgnore>true</testFailureIgnore> -->

 						<includes>

 							<include>**/AllTests.class</include>

diff --git a/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/acquire/AcquireDumpTest.java b/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/acquire/AcquireDumpTest.java
index 4612b341..54b59914 100644
--- a/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/acquire/AcquireDumpTest.java
+++ b/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/acquire/AcquireDumpTest.java
@@ -202,6 +202,7 @@ public class AcquireDumpTest
                         }

                     }

                     collector.checkThat("Dump file", dmp, notNullValue());

+                    System.out.println("Dump "+dmp.getAbsolutePath()+" "+dmp.length());

                     try

                     {

                         ISnapshot answer = SnapshotFactory.openSnapshot(dmp, Collections.<String, String> emptyMap(), l);

@@ -218,6 +219,7 @@ public class AcquireDumpTest
                         finally

                         {

                             SnapshotFactory.dispose(answer);

+                            answer = null;

                         }

                     }

                     finally

@@ -245,7 +247,7 @@ public class AcquireDumpTest
      * @throws SnapshotException

      * @throws IOException

      */

-    @Ignore("OOM error with new CI build")

+    //@Ignore("OOM error with new CI build")

     @Test

     public void testAcquireDumpUncompressed() throws SnapshotException, IOException

     {

@@ -258,7 +260,7 @@ public class AcquireDumpTest
      * @throws SnapshotException

      * @throws IOException

      */

-    @Ignore("OOM error with new CI build")

+    //@Ignore("OOM error with new CI build")

     @Test

     public void testAcquireDumpCompressed() throws SnapshotException, IOException

     {

diff --git a/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/collect/ExtractCollectionEntriesTest3.java b/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/collect/ExtractCollectionEntriesTest3.java
index b8c5a25a..cc486151 100644
--- a/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/collect/ExtractCollectionEntriesTest3.java
+++ b/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/collect/ExtractCollectionEntriesTest3.java
@@ -117,8 +117,9 @@ public class ExtractCollectionEntriesTest3 extends ExtractCollectionEntriesTest2
                     }

                     // List collections

                     String dmppath = dmp.getAbsolutePath();

+                    System.out.println("Dump "+dmppath+" "+dmp.length());

                     String dmpname = hdp.getClass().getName()+" "+dmp.getName();

-                    for (Collection c : cdp.getListCollectionTestData())

+                    for (Collection<?> c : cdp.getListCollectionTestData())

                     {

                         Object[] objects = new Object[] { dmppath, dmpname, 1, c.getClass().getName() };

                         for (Object o[] : parms)

@@ -133,7 +134,7 @@ public class ExtractCollectionEntriesTest3 extends ExtractCollectionEntriesTest2
                             parms.add(objects);

                     }

                     // Non-List collections

-                    for (Collection c : cdp.getNonListCollectionTestData())

+                    for (Collection<?> c : cdp.getNonListCollectionTestData())

                     {

                         Object[] objects = new Object[] { dmppath, dmpname, 2, c.getClass().getName() };

                         for (Object o[] : parms)

@@ -148,7 +149,7 @@ public class ExtractCollectionEntriesTest3 extends ExtractCollectionEntriesTest2
                             parms.add(objects);

                     }

                     // Empty List collections

-                    for (Collection c : cdp.getEmptyListCollectionTestData())

+                    for (Collection<?> c : cdp.getEmptyListCollectionTestData())

                     {

                         Object[] objects = new Object[] { dmppath, dmpname, 3, c.getClass().getName() };

                         for (Object o[] : parms)

@@ -163,7 +164,7 @@ public class ExtractCollectionEntriesTest3 extends ExtractCollectionEntriesTest2
                             parms.add(objects);

                     }

                     // Empty Non-List collections

-                    for (Collection c : cdp.getEmptyNonListCollectionTestData())

+                    for (Collection<?> c : cdp.getEmptyNonListCollectionTestData())

                     {

                         Object[] objects = new Object[] { dmppath, dmpname, 4, c.getClass().getName() };

                         for (Object o[] : parms)

@@ -178,7 +179,7 @@ public class ExtractCollectionEntriesTest3 extends ExtractCollectionEntriesTest2
                             parms.add(objects);

                     }

                     // Maps

-                    for (Map m : cdp.getMapTestData())

+                    for (Map<?,?> m : cdp.getMapTestData())

                     {

                         Object[] objects = new Object[] { dmppath, dmpname, 5, m.getClass().getName() };

                         for (Object o[] : parms)

@@ -193,7 +194,7 @@ public class ExtractCollectionEntriesTest3 extends ExtractCollectionEntriesTest2
                             parms.add(objects);

                     }

                     // Empty Maps

-                    for (Map m : cdp.getEmptyMapTestData())

+                    for (Map<?,?> m : cdp.getEmptyMapTestData())

                     {

                         Object[] objects = new Object[] { dmppath, dmpname, 6, m.getClass().getName() };

                         for (Object o[] : parms)

@@ -217,11 +218,11 @@ public class ExtractCollectionEntriesTest3 extends ExtractCollectionEntriesTest2
         return parms;

     }

 

-    @Ignore("OOM error in new CI build")

+    //@Ignore("OOM error in new CI build")

     @Test

     public void testCollections() throws SnapshotException

     {

-        assumeThat("OOM error in new CI build", classname, not(equalTo("java.util.ArrayList")));

+        //assumeThat("OOM error in new CI build", classname, not(equalTo("java.util.ArrayList")));

         switch (type)

         {

             case 1: