You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2018/01/22 22:04:08 UTC
[incubator-netbeans] branch master updated (33a4b82 -> 30e1884)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from 33a4b82 Merge pull request #381 from JaroslavTulach/RemoveAncientSPL
new e987e05 [NETBEANS-138] Fix ScanStartedTest in parsing.indexing module.
new d74705d [NETBEANS-138] Create archive sample needed for RepositoryUpdaterTest from build artifacts
new 30e1884 Merge branch 'pr/374'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
parsing.indexing/build.xml | 10 +++++++++
.../parsing/impl/indexing/ScanStartedTest.java | 24 ++++++++++------------
2 files changed, 21 insertions(+), 13 deletions(-)
--
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans] 01/03: [NETBEANS-138] Fix ScanStartedTest in
parsing.indexing module.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit e987e051ffa77f6e5b9ff8c546fac7dff73486ee
Author: blackleg <he...@gmail.com>
AuthorDate: Thu Jan 18 08:11:09 2018 +0100
[NETBEANS-138] Fix ScanStartedTest in parsing.indexing module.
Closes: #374
---
.../parsing/impl/indexing/ScanStartedTest.java | 24 ++++++++++------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ScanStartedTest.java b/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ScanStartedTest.java
index 01c0c8b..eec23e7 100644
--- a/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ScanStartedTest.java
+++ b/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ScanStartedTest.java
@@ -60,6 +60,10 @@ public class ScanStartedTest extends IndexingTestBase {
private final Map<String, Map<ClassPath,Void>> registeredClasspaths = new HashMap<String, Map<ClassPath,Void>>();
+ private static final Logger LOG = Logger.getLogger(RepositoryUpdater.class.getName()+".tests"); //NOI18N
+
+ private TestHandler handler;
+
private IndexerFactory factory1;
private IndexerFactory factory2;
private IndexerFactory factory3;
@@ -84,12 +88,12 @@ public class ScanStartedTest extends IndexingTestBase {
super.getAdditionalServices(clazz);
clazz.add(FooCPP.class);
}
-
- final TestHandler handler = new TestHandler();
@Override
protected void setUp() throws Exception {
super.setUp();
+
+ handler = new TestHandler();
this.clearWorkDir();
final File _wd = this.getWorkDir();
@@ -125,29 +129,24 @@ public class ScanStartedTest extends IndexingTestBase {
MockMimeLookup.setInstances(MimePath.EMPTY, binFactory1, binFactory2, binFactory3);
MockMimeLookup.setInstances(MimePath.get(FOO_MIME), factory1, factory2, factory3);
RepositoryUpdaterTest.setMimeTypes(FOO_MIME);
-
- RepositoryUpdaterTest.waitForRepositoryUpdaterInit();
- final Logger logger = Logger.getLogger(RepositoryUpdater.class.getName()+".tests"); //NOI18N
- logger.setLevel (Level.FINEST);
- logger.addHandler(handler);
+ RepositoryUpdaterTest.waitForRepositoryUpdaterInit();
+
+ LOG.setLevel (Level.FINEST);
+ LOG.addHandler(handler);
}
@Override
protected void tearDown() throws Exception {
- final TestHandler handler = new TestHandler();
- final Logger logger = Logger.getLogger(RepositoryUpdater.class.getName()+".tests"); //NOI18N
try {
- logger.setLevel (Level.FINEST);
- logger.addHandler(handler);
for(String id : registeredClasspaths.keySet()) {
final Map<ClassPath,Void> classpaths = registeredClasspaths.get(id);
GlobalPathRegistry.getDefault().unregister(id, classpaths.keySet().toArray(new ClassPath[classpaths.size()]));
}
handler.await();
} finally {
- logger.removeHandler(handler);
+ LOG.removeHandler(handler);
}
super.tearDown();
}
@@ -252,7 +251,6 @@ public class ScanStartedTest extends IndexingTestBase {
public void testBinaryScanFinishedAfterScanStartedWithException() throws Exception {
assertTrue(GlobalPathRegistry.getDefault().getPaths(FOO_BINARY).isEmpty());
-
binFactory2.throwFromScanStarted = new RuntimeException();
//Testing classpath registration
--
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans] 03/03: Merge branch 'pr/374'
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 30e18843003c865a384903488c6b7438554d254b
Merge: 33a4b82 d74705d
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Mon Jan 22 22:48:03 2018 +0100
Merge branch 'pr/374'
parsing.indexing/build.xml | 10 +++++++++
.../parsing/impl/indexing/ScanStartedTest.java | 24 ++++++++++------------
2 files changed, 21 insertions(+), 13 deletions(-)
--
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans] 02/03: [NETBEANS-138] Create archive sample
needed for RepositoryUpdaterTest from build artifacts
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit d74705dffc65ae259178fb7f859fc4e8da57a5bb
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Mon Jan 22 22:46:46 2018 +0100
[NETBEANS-138] Create archive sample needed for RepositoryUpdaterTest from build artifacts
Closes: #375
---
parsing.indexing/build.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/parsing.indexing/build.xml b/parsing.indexing/build.xml
index cd26417..ac4bdff 100644
--- a/parsing.indexing/build.xml
+++ b/parsing.indexing/build.xml
@@ -22,4 +22,14 @@
<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>
--
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists