You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/03/04 11:48:41 UTC
[GitHub] matthiasblaesing closed pull request #398: [NETBEANS-139] Create archive sample to fix RepositoryUpdaterEventTest.
matthiasblaesing closed pull request #398: [NETBEANS-139] Create archive sample to fix RepositoryUpdaterEventTest.
URL: https://github.com/apache/incubator-netbeans/pull/398
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/parsing.indexing/build.xml b/parsing.indexing/build.xml
index ac4bdffa1..cd2641724 100644
--- a/parsing.indexing/build.xml
+++ b/parsing.indexing/build.xml
@@ -22,14 +22,4 @@
<project basedir="." default="netbeans" name="parsing.indexing">
<description>Builds, tests, and runs the project org.netbeans.modules.parsing.indexing</description>
<import file="../nbbuild/templates/projectized.xml"/>
-
- <target name="do-unit-test-build" depends="projectized.do-unit-test-build,compile">
- <!-- Prepare demo jar file used in RepositoryUpdaterTest -->
- <echo message="Creating sample data"/>
- <mkdir dir="${basedir}/build/test/unit/data/" />
- <zip file="${basedir}/build/test/unit/data/JavaApplication1.jar">
- <fileset dir="${basedir}/build/classes/" includes="**" />
- <fileset dir="${basedir}/build/classes-generated/" includes="**"/>
- </zip>
- </target>
</project>
diff --git a/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdaterTest.java b/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdaterTest.java
index 2b4a76f6a..52337c8c6 100644
--- a/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdaterTest.java
+++ b/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdaterTest.java
@@ -23,6 +23,7 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -158,6 +159,8 @@
private FileObject unknown2;
private FileObject unknownSrc2;
protected FileObject srcRootWithFiles1;
+
+ private FileObject jarFile;
FileObject f1;
protected FileObject f3;
@@ -232,12 +235,15 @@ protected void setUp() throws Exception {
assertNotNull (bootRoot1);
bootRoot2 = wd.createFolder("boot2");
assertNotNull (bootRoot2);
+ bootRoot3 = wd.createFolder("boot3");
+ assertNotNull (bootRoot3);
+
FileUtil.setMIMEType("jar", JARMIME);
- FileObject jarFile = FileUtil.toFileObject(getDataDir()).getFileObject("JavaApplication1.jar");
+ jarFile = FileUtil.createData(bootRoot3, "JavaApplication1.jar");
assertNotNull(jarFile);
+ zipFileObject(jarFile);
assertTrue(FileUtil.isArchiveFile(jarFile));
- bootRoot3 = FileUtil.getArchiveRoot(jarFile);
- assertNotNull (bootRoot3);
+
compSrc1 = wd.createFolder("cs1");
assertNotNull (compSrc1);
compSrc2 = wd.createFolder("cs2");
@@ -594,10 +600,6 @@ public void testBinaryDeletedAdded() throws Exception {
logger.setLevel (Level.FINEST);
logger.addHandler(handler);
- final FileObject jarFile = FileUtil.toFileObject(getDataDir()).getFileObject("JavaApplication1.jar");
- assertNotNull(jarFile);
- assertTrue(FileUtil.isArchiveFile(jarFile));
-
final FileObject wd = FileUtil.toFileObject(getWorkDir());
final FileObject[] jar2Delete = new FileObject[] {jarFile.copy(wd, "test", "jar")};
ClassPath cp = ClassPathSupport.createClassPath(new FileObject[] {FileUtil.getArchiveRoot(jar2Delete[0])});
@@ -2452,6 +2454,13 @@ public static void setMimeTypes(final String... mimes) {
Set<String> mt = new HashSet<>(Arrays.asList(mimes));
Util.allMimeTypes = mt;
}
+
+ protected static void zipFileObject(FileObject fileObject) throws FileNotFoundException, IOException {
+ File file = FileUtil.toFile(fileObject);
+ FileOutputStream fileOutputStream = new FileOutputStream(file);
+ ZipOutputStream os = new ZipOutputStream(fileOutputStream);
+ os.close();
+ }
// <editor-fold defaultstate="collapsed" desc="Mock Services">
public static class TestHandler extends Handler {
diff --git a/parsing.nb/build.xml b/parsing.nb/build.xml
index 513ed57af..7fedcc2a8 100644
--- a/parsing.nb/build.xml
+++ b/parsing.nb/build.xml
@@ -22,4 +22,5 @@
<project basedir="." default="netbeans" name="parsing.nb">
<description>Builds, tests, and runs the project org.netbeans.modules.parsing.nb</description>
<import file="../nbbuild/templates/projectized.xml"/>
+
</project>
diff --git a/parsing.nb/test/unit/src/org/netbeans/modules/parsing/nb/RepositoryUpdaterEventTest.java b/parsing.nb/test/unit/src/org/netbeans/modules/parsing/nb/RepositoryUpdaterEventTest.java
index 80c2144e5..fb038a639 100644
--- a/parsing.nb/test/unit/src/org/netbeans/modules/parsing/nb/RepositoryUpdaterEventTest.java
+++ b/parsing.nb/test/unit/src/org/netbeans/modules/parsing/nb/RepositoryUpdaterEventTest.java
@@ -19,11 +19,9 @@
package org.netbeans.modules.parsing.nb;
-import org.netbeans.modules.parsing.nb.EventSupport;
import java.lang.reflect.Field;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.SwingUtilities;
-import static junit.framework.Assert.assertNotNull;
import junit.framework.TestSuite;
import org.netbeans.modules.parsing.api.Source;
import org.netbeans.modules.parsing.api.indexing.IndexingManager;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists