xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2207 removing custom org.junit

Browse source 
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b

Former-commit-id: b429fdd192 [formerly fd14405886] [formerly 185296c67d] [formerly b429fdd192 [formerly fd14405886] [formerly 185296c67d] [formerly 4ccfc5be82 [formerly 185296c67d [formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]]]]
Former-commit-id: 4ccfc5be82
Former-commit-id: 1f3f5ace25 [formerly 93976753df] [formerly 732c085e88be485c5665de3436f4d63820939a50 [formerly a3fd5fa3ee]]
Former-commit-id: 22483908ee1d82807ddfff8307bf138123ebbb9d [formerly 2e5b04450e]
Former-commit-id: ed3a464cdf
This commit is contained in:
Nate Jensen 2013-07-25 16:48:18 -05:00
parent f25baafe68
commit 07e32f95f7
31 changed files with 172 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
View file

@ -337,12 +337,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.junit"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.hamcrest.core"
download-size="0"

8
cots/org.hamcrest/.classpath Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="hamcrest-all-1.3-sources.jar"/>
<classpathentry exported="true" kind="lib" path="hamcrest-all-1.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

28
cots/org.hamcrest/.project Normal file
View file

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.hamcrest</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

2
cots/org.junit/.settings/org.eclipse.jdt.core.prefs → cots/org.hamcrest/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,5 +1,5 @@
#Thu Mar 26 11:27:42 CDT 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

32
cots/org.hamcrest/META-INF/MANIFEST.MF Normal file
View file

@ -0,0 +1,32 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Hamcrest
Bundle-SymbolicName: org.hamcrest
Bundle-Version: 1.3
Bundle-ClassPath: hamcrest-all-1.3-sources.jar,
hamcrest-all-1.3.jar
Bundle-Vendor: Hamcrest
Export-Package: org.hamcrest,
org.hamcrest.beans,
org.hamcrest.collection,
org.hamcrest.core,
org.hamcrest.generator,
org.hamcrest.generator.config,
org.hamcrest.generator.qdox,
org.hamcrest.generator.qdox.ant,
org.hamcrest.generator.qdox.directorywalker,
org.hamcrest.generator.qdox.junit,
org.hamcrest.generator.qdox.model,
org.hamcrest.generator.qdox.model.annotation,
org.hamcrest.generator.qdox.model.util,
org.hamcrest.generator.qdox.parser,
org.hamcrest.generator.qdox.parser.impl,
org.hamcrest.generator.qdox.parser.structs,
org.hamcrest.generator.qdox.tools,
org.hamcrest.integration,
org.hamcrest.internal,
org.hamcrest.number,
org.hamcrest.object,
org.hamcrest.text,
org.hamcrest.xml
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

3
cots/org.hamcrest/build.properties Normal file
View file

@ -0,0 +1,3 @@
bin.includes = META-INF/,\
hamcrest-all-1.3-sources.jar,\
hamcrest-all-1.3.jar

0
cots/org.junit/hamcrest-all-1.3-sources.jar → cots/org.hamcrest/hamcrest-all-1.3-sources.jar
View file

0
cots/org.junit/hamcrest-all-1.3.jar → cots/org.hamcrest/hamcrest-all-1.3.jar
View file

16
cots/org.junit/.classpath
View file

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="hamcrest-all-1.3.jar" sourcepath="hamcrest-all-1.3-sources.jar"/>
<classpathentry exported="true" kind="lib" path="junit-dep-4.11.jar" sourcepath="junit-4.11-src.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="jmock-2.0.0.jar" sourcepath="org.junitsrc.zip"/>
<classpathentry exported="true" kind="lib" path="jmock-junit3-2.0.0.jar" sourcepath="org.junitsrc.zip"/>
<classpathentry exported="true" kind="lib" path="jmock-junit4-2.0.0.jar" sourcepath="org.junitsrc.zip"/>
<classpathentry exported="true" kind="lib" path="cglib-nodep-2.2.jar"/>
<classpathentry exported="true" kind="lib" path="javassist-3.16.1-GA.jar"/>
<classpathentry exported="true" kind="lib" path="mockito-all-1.9.0.jar"/>
<classpathentry exported="true" kind="lib" path="objenesis-1.2.jar"/>
<classpathentry exported="true" kind="lib" path="powermock-mockito-1.4.12-full.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

225
cots/org.junit/META-INF/MANIFEST.MF
View file

@ -1,225 +0,0 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Junit Plug-in
Bundle-SymbolicName: org.junit
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: jmock-2.0.0.jar,
jmock-junit3-2.0.0.jar,
jmock-junit4-2.0.0.jar,
cglib-nodep-2.2.jar,
javassist-3.16.1-GA.jar,
mockito-all-1.9.0.jar,
objenesis-1.2.jar,
powermock-mockito-1.4.12-full.jar,
hamcrest-all-1.3.jar,
junit-dep-4.11.jar
Export-Package: javassist,
javassist.bytecode,
javassist.bytecode.analysis,
javassist.bytecode.annotation,
javassist.bytecode.stackmap,
javassist.compiler,
javassist.compiler.ast,
javassist.convert,
javassist.expr,
javassist.runtime,
javassist.scopedpool,
javassist.tools,
javassist.tools.reflect,
javassist.tools.rmi,
javassist.tools.web,
javassist.util,
javassist.util.proxy,
junit.extensions,
junit.framework,
junit.runner,
junit.textui,
net.sf.cglib.asm,
net.sf.cglib.asm.signature,
net.sf.cglib.beans,
net.sf.cglib.core,
net.sf.cglib.proxy,
net.sf.cglib.reflect,
net.sf.cglib.transform,
net.sf.cglib.transform.impl,
net.sf.cglib.util,
org.hamcrest,
org.hamcrest.beans,
org.hamcrest.collection,
org.hamcrest.core,
org.hamcrest.generator,
org.hamcrest.generator.config,
org.hamcrest.generator.qdox,
org.hamcrest.generator.qdox.ant,
org.hamcrest.generator.qdox.directorywalker,
org.hamcrest.generator.qdox.junit,
org.hamcrest.generator.qdox.model,
org.hamcrest.generator.qdox.model.annotation,
org.hamcrest.generator.qdox.model.util,
org.hamcrest.generator.qdox.parser,
org.hamcrest.generator.qdox.parser.impl,
org.hamcrest.generator.qdox.parser.structs,
org.hamcrest.generator.qdox.tools,
org.hamcrest.integration,
org.hamcrest.internal,
org.hamcrest.number,
org.hamcrest.object,
org.hamcrest.text,
org.hamcrest.xml,
org.jmock,
org.jmock.api,
org.jmock.example.qcon,
org.jmock.example.sniper,
org.jmock.example.timedcache,
org.jmock.integration.junit3,
org.jmock.integration.junit4,
org.jmock.internal,
org.jmock.internal.matcher,
org.jmock.lib,
org.jmock.lib.action,
org.jmock.syntax,
org.junit,
org.junit.experimental,
org.junit.experimental.categories,
org.junit.experimental.max,
org.junit.experimental.results,
org.junit.experimental.runners,
org.junit.experimental.theories,
org.junit.experimental.theories.internal,
org.junit.experimental.theories.suppliers,
org.junit.internal,
org.junit.internal.builders,
org.junit.internal.matchers,
org.junit.internal.requests,
org.junit.internal.runners,
org.junit.internal.runners.model,
org.junit.internal.runners.rules,
org.junit.internal.runners.statements,
org.junit.matchers,
org.junit.rules,
org.junit.runner,
org.junit.runner.manipulation,
org.junit.runner.notification,
org.junit.runners,
org.junit.runners.model,
org.mockito,
org.mockito.asm,
org.mockito.asm.signature,
org.mockito.asm.tree,
org.mockito.asm.tree.analysis,
org.mockito.asm.util,
org.mockito.cglib.beans,
org.mockito.cglib.core,
org.mockito.cglib.proxy,
org.mockito.cglib.reflect,
org.mockito.cglib.transform,
org.mockito.cglib.transform.impl,
org.mockito.cglib.util,
org.mockito.configuration,
org.mockito.exceptions,
org.mockito.exceptions.base,
org.mockito.exceptions.misusing,
org.mockito.exceptions.verification,
org.mockito.exceptions.verification.junit,
org.mockito.internal,
org.mockito.internal.configuration,
org.mockito.internal.configuration.injection,
org.mockito.internal.configuration.injection.filter,
org.mockito.internal.creation,
org.mockito.internal.creation.cglib,
org.mockito.internal.creation.jmock,
org.mockito.internal.debugging,
org.mockito.internal.exceptions,
org.mockito.internal.exceptions.base,
org.mockito.internal.exceptions.util,
org.mockito.internal.invocation,
org.mockito.internal.invocation.finder,
org.mockito.internal.invocation.realmethod,
org.mockito.internal.listeners,
org.mockito.internal.matchers,
org.mockito.internal.matchers.apachecommons,
org.mockito.internal.progress,
org.mockito.internal.reporting,
org.mockito.internal.runners,
org.mockito.internal.runners.util,
org.mockito.internal.stubbing,
org.mockito.internal.stubbing.answers,
org.mockito.internal.stubbing.defaultanswers,
org.mockito.internal.util,
org.mockito.internal.util.junit,
org.mockito.internal.util.reflection,
org.mockito.internal.verification,
org.mockito.internal.verification.api,
org.mockito.internal.verification.argumentmatching,
org.mockito.internal.verification.checkers,
org.mockito.invocation,
org.mockito.listeners,
org.mockito.runners,
org.mockito.stubbing,
org.mockito.stubbing.answers,
org.mockito.verification,
org.objenesis,
org.objenesis.instantiator,
org.objenesis.instantiator.basic,
org.objenesis.instantiator.gcj,
org.objenesis.instantiator.jrockit,
org.objenesis.instantiator.perc,
org.objenesis.instantiator.sun,
org.objenesis.strategy,
org.powermock.api.extension.listener,
org.powermock.api.extension.proxyframework,
org.powermock.api.mockito,
org.powermock.api.mockito.expectation,
org.powermock.api.mockito.internal,
org.powermock.api.mockito.internal.configuration,
org.powermock.api.mockito.internal.expectation,
org.powermock.api.mockito.internal.invocationcontrol,
org.powermock.api.mockito.internal.mockcreation,
org.powermock.api.mockito.internal.verification,
org.powermock.api.mockito.mockpolicies,
org.powermock.api.mockito.powermocklistener,
org.powermock.api.mockito.verification,
org.powermock.api.support,
org.powermock.api.support.membermodification,
org.powermock.api.support.membermodification.strategy,
org.powermock.api.support.membermodification.strategy.impl,
org.powermock.classloading,
org.powermock.classloading.spi,
org.powermock.core,
org.powermock.core.classloader,
org.powermock.core.classloader.annotations,
org.powermock.core.spi,
org.powermock.core.spi.listener,
org.powermock.core.spi.support,
org.powermock.core.spi.testresult,
org.powermock.core.spi.testresult.impl,
org.powermock.core.testlisteners,
org.powermock.core.transformers,
org.powermock.core.transformers.impl,
org.powermock.mockpolicies,
org.powermock.mockpolicies.impl,
org.powermock.mockpolicies.support,
org.powermock.modules.junit3,
org.powermock.modules.junit3.internal,
org.powermock.modules.junit3.internal.impl,
org.powermock.modules.junit4,
org.powermock.modules.junit4.common.internal,
org.powermock.modules.junit4.common.internal.impl,
org.powermock.modules.junit4.internal.impl,
org.powermock.modules.junit4.internal.impl.testcaseworkaround,
org.powermock.modules.junit4.legacy,
org.powermock.modules.junit4.legacy.internal.impl,
org.powermock.modules.junit4.legacy.internal.impl.testcaseworkaround,
org.powermock.modules.testng,
org.powermock.modules.testng.internal,
org.powermock.reflect,
org.powermock.reflect.exceptions,
org.powermock.reflect.internal,
org.powermock.reflect.internal.matcherstrategies,
org.powermock.reflect.internal.primitivesupport,
org.powermock.reflect.matching,
org.powermock.reflect.proxyframework,
org.powermock.reflect.spi,
org.powermock.tests.utils,
org.powermock.tests.utils.impl
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

11
cots/org.junit/build.properties
View file

@ -1,11 +0,0 @@
bin.includes = META-INF/,\
jmock-2.0.0.jar,\
jmock-junit3-2.0.0.jar,\
jmock-junit4-2.0.0.jar,\
cglib-nodep-2.2.jar,\
javassist-3.16.1-GA.jar,\
mockito-all-1.9.0.jar,\
objenesis-1.2.jar,\
powermock-mockito-1.4.12-full.jar,\
hamcrest-all-1.3.jar,\
junit-dep-4.11.jar

BIN
cots/org.junit/cglib-nodep-2.2.jar
View file

Binary file not shown.

BIN
cots/org.junit/javassist-3.16.1-GA.jar
View file

Binary file not shown.

BIN
cots/org.junit/jmock-2.0.0.jar
View file

Binary file not shown.

BIN
cots/org.junit/jmock-junit3-2.0.0.jar
View file

Binary file not shown.

BIN
cots/org.junit/jmock-junit4-2.0.0.jar
View file

Binary file not shown.

BIN
cots/org.junit/junit-4.11-src.jar
View file

Binary file not shown.

BIN
cots/org.junit/junit-dep-4.11.jar
View file

Binary file not shown.

BIN
cots/org.junit/objenesis-1.2.jar
View file

Binary file not shown.

0
cots/org.junit/org.junit.ecl
View file

BIN
cots/org.junit/powermock-mockito-1.4.12-full.jar
View file

Binary file not shown.

7
cots/org.mockito/.classpath Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="mockito-all-1.9.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
cots/org.junit/.project → cots/org.mockito/.project
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.junit</name>
<name>org.mockito</name>
<comment></comment>
<projects>
</projects>

7
cots/org.mockito/.settings/org.eclipse.jdt.core.prefs Normal file
View file

@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6

71
cots/org.mockito/META-INF/MANIFEST.MF Normal file
View file

@ -0,0 +1,71 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mockito
Bundle-SymbolicName: org.mockito
Bundle-Version: 1.9.0
Bundle-ClassPath: mockito-all-1.9.0.jar
Bundle-Vendor: Mockito
Export-Package: org.mockito,
org.mockito.asm,
org.mockito.asm.signature,
org.mockito.asm.tree,
org.mockito.asm.tree.analysis,
org.mockito.asm.util,
org.mockito.cglib.beans,
org.mockito.cglib.core,
org.mockito.cglib.proxy,
org.mockito.cglib.reflect,
org.mockito.cglib.transform,
org.mockito.cglib.transform.impl,
org.mockito.cglib.util,
org.mockito.configuration,
org.mockito.exceptions,
org.mockito.exceptions.base,
org.mockito.exceptions.misusing,
org.mockito.exceptions.verification,
org.mockito.exceptions.verification.junit,
org.mockito.internal,
org.mockito.internal.configuration,
org.mockito.internal.configuration.injection,
org.mockito.internal.configuration.injection.filter,
org.mockito.internal.creation,
org.mockito.internal.creation.cglib,
org.mockito.internal.creation.jmock,
org.mockito.internal.debugging,
org.mockito.internal.exceptions,
org.mockito.internal.exceptions.base,
org.mockito.internal.exceptions.util,
org.mockito.internal.invocation,
org.mockito.internal.invocation.finder,
org.mockito.internal.invocation.realmethod,
org.mockito.internal.listeners,
org.mockito.internal.matchers,
org.mockito.internal.matchers.apachecommons,
org.mockito.internal.progress,
org.mockito.internal.reporting,
org.mockito.internal.runners,
org.mockito.internal.runners.util,
org.mockito.internal.stubbing,
org.mockito.internal.stubbing.answers,
org.mockito.internal.stubbing.defaultanswers,
org.mockito.internal.util,
org.mockito.internal.util.junit,
org.mockito.internal.util.reflection,
org.mockito.internal.verification,
org.mockito.internal.verification.api,
org.mockito.internal.verification.argumentmatching,
org.mockito.internal.verification.checkers,
org.mockito.invocation,
org.mockito.listeners,
org.mockito.runners,
org.mockito.stubbing,
org.mockito.stubbing.answers,
org.mockito.verification,
org.objenesis,
org.objenesis.instantiator,
org.objenesis.instantiator.basic,
org.objenesis.instantiator.gcj,
org.objenesis.instantiator.jrockit,
org.objenesis.instantiator.sun,
org.objenesis.strategy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

2
cots/org.mockito/build.properties Normal file
View file

@ -0,0 +1,2 @@
bin.includes = META-INF/,\
mockito-all-1.9.0.jar

0
cots/org.junit/mockito-all-1.9.0.jar → cots/org.mockito/mockito-all-1.9.0.jar
View file

6
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
View file

@ -124,12 +124,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.junit"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.message"
download-size="0"

4
tests/.classpath
View file

@ -6,7 +6,6 @@
<classpathentry kind="src" path="integration"/>
<classpathentry kind="src" path="manual"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.junit"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.commons.codec"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.slf4j"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.eclipse.jetty"/>
@ -150,5 +149,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/gov.noaa.nws.ncep.gempak.parameters.core"/>
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.rcm.lib"/>
<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.rcm.server"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.hamcrest"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.mockito"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>

4
tests/README Normal file
View file

@ -0,0 +1,4 @@
Notes on running tests:
1. The order on the classpath of Hamcrest, Mockito, and JUnit is very important to getting
the tests to run correctly. There are different versions of Hamcrest classes in each.

8
tests/build.xml
View file

@ -30,7 +30,8 @@
<target name="classpath-setup-developer" depends="env-setup" unless="jenkins.build">
<path id="test.compile.classpath">
<dirset dir="${AWIPS2_BASELINE}" includes="**/bin" />
<fileset dir="${AWIPS2_BASELINE}/cots/org.junit" includes="**/*.jar" />
<fileset dir="${AWIPS2_BASELINE}/cots/org.hamcrest" includes="**/*.jar" />
<fileset dir="${AWIPS2_BASELINE}/cots/org.mockito" includes="**/*.jar" />
<fileset dir="${AWIPS2_BASELINE}/cots/org.springframework" includes="**/*.jar" />
<fileset dir="${AWIPS2_BASELINE}/cots/org.slf4j" includes="**/*.jar" />
<fileset dir="${AWIPS2_BASELINE}/cots" includes="**/*.jar" excludes="**/ant-*.jar" />
@ -57,8 +58,9 @@
</for>
<path id="test.compile.classpath">
<fileset dir="${UNZIP.DIR}" includes="**/*.jar" excludes="**/ant-*.jar" />
<fileset dir="${PROJECTS.DIR}/org.junit" includes="**/*.jar" />
<fileset dir="${UNZIP.DIR}" includes="**/*.jar" excludes="**/ant-*.jar" />
<fileset dir="${PROJECTS.DIR}/org.hamcrest" includes="**/*.jar" />
<fileset dir="${PROJECTS.DIR}/org.mockito" includes="**/*.jar" />
<fileset dir="${PROJECTS.DIR}/org.springframework" includes="**/*.jar" />
<fileset dir="${PROJECTS.DIR}/org.slf4j" includes="**/*.jar" />
<fileset dir="${basedir}/lib" includes="**/*.jar" />