mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

M dist/build.xml 

M dist/netbeans/build.xml

- support for building a mac os x universal binary distribution

M dist/mcp-test/src/test/java/cardemo/CarDemoTest.java

- re-enable cardemo test.  The right way to disable this is to
  do it in the build file.

M dist/mcp-test/src/test/java/jsf_jmaki/JsfjMakiTest.java

- use getAnchors() to get the right link.

M dist/netbeans/nbproject/project.properties

- add junit to classpath

dist/build.xml dist/mcp-test/src/test/java/cardemo/CarDemoTest.java dist/mcp-test/src/test/java/jsf_jmaki/JsfjMakiTest.java dist/netbeans/build.xml dist/netbeans/nbproject/project.properties
This commit is contained in:
edburns%acm.org 2007-06-22 03:41:15 +00:00
Родитель 8bdd21ccff
Коммит 36ab54e08c
5 изменённых файлов: 36 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
java/dist/build.xml поставляемый
Просмотреть файл

@ -63,6 +63,14 @@
</antcall>
</target>
<target name="clean.universal">
<antcall target="clean">
<param name="objdir" value="${objdir}/ppc/dist/universal" />
<param name="core.java.classes.uptodate" value="true" />
</antcall>
</target>
<target name="release"
description="Build a Webclient Release">
@ -100,7 +108,7 @@
</and>
</condition>
<condition property="platform" value="macosx-ppc">
<condition property="platform" value="macosx">
<and>
<os name="Mac OS X" />
</and>
@ -124,7 +132,7 @@
</and>
</condition>
<condition property="platform" value="macosx-ppc">
<condition property="platform" value="macosx">
<and>
<os name="Mac OS X" />
</and>
@ -210,15 +218,15 @@
</and>
</condition>
<condition property="platform" value="linux">
<condition property="platform" value="macosx">
<and>
<os family="unix" />
<os name="Mac OS X" />
</and>
</condition>
<condition property="platform" value="darwin-ppc">
<condition property="platform" value="linux">
<and>
<os name="Mac OS X" />
<os family="unix" />
</and>
</condition>
@ -284,11 +292,11 @@
</target>
<target name="copy.binaries" depends="prepare">
<copy todir="${dist.home}/bin/components"
<copy todir="${dist.home}/bin/${platform}/bin/components"
file="${objdir}/java/dom/src/${so.prefix}javadom.${so.extension}" />
<copy todir="${dist.home}/bin"
<copy todir="${dist.home}/bin/${platform}/bin"
file="${objdir}/java/dom/jni/${so.prefix}javadomjni.${jni.extension}" />
<copy todir="${dist.home}/bin"
<copy todir="${dist.home}/bin/${platform}/bin"
file="${objdir}/java/webclient/src_moz/${so.prefix}${name}.${jni.extension}" />
</target>

9
java/dist/mcp-test/src/test/java/cardemo/CarDemoTest.java поставляемый
Просмотреть файл

@ -1,5 +1,5 @@
/*
* $Id: CarDemoTest.java,v 1.9 2007-06-19 20:18:12 edburns%acm.org Exp $
* $Id: CarDemoTest.java,v 1.10 2007-06-22 03:41:14 edburns%acm.org Exp $
*/
/*
@ -73,7 +73,8 @@ public class CarDemoTest extends WebclientTestCase {
assertTrue(true);
}
public void NOTtestCardemo() throws Exception {
public void testCardemo() throws Exception {
mcp.setBounds(30, 30, 960, 960);
mcp.getRealizedVisibleBrowserWindow();
final BitSet bitSet = new BitSet();
AjaxListener listener = new AjaxListener() {
@ -125,13 +126,13 @@ public class CarDemoTest extends WebclientTestCase {
mcp.addAjaxListener(listener);
// Load the main page of the app
mcp.blockingLoad("http://webdev1.sun.com/jsf-ajax-cardemo/faces/chooseLocale.jsp");
mcp.blockingLoad("http://localhost:8080/jsf-ajax-cardemo/faces/chooseLocale.jsp");
// Choose the "German" language button
mcp.blockingClickElement("j_id_id73:Germany");
// Choose the roadster
//mcp.blockingClickElement("j_id_id18:j_id_id43");
mcp.blockingClickElement("j_id_id18:j_id_id43");
boolean neverend = true;
while (neverend) {

10
java/dist/mcp-test/src/test/java/jsf_jmaki/JsfjMakiTest.java поставляемый
Просмотреть файл

@ -1,5 +1,5 @@
/*
* $Id: JsfjMakiTest.java,v 1.2 2007-05-04 17:10:16 edburns%acm.org Exp $
* $Id: JsfjMakiTest.java,v 1.3 2007-06-22 03:41:15 edburns%acm.org Exp $
*/
/*
@ -142,14 +142,18 @@ public class JsfjMakiTest extends WebclientTestCase {
mcp.addAjaxListener(listener);
// Load the main page of the app
mcp.blockingLoad("http://webdev2.sun.com/jsf-jmaki/index-demo.jsf");
mcp.blockingLoad("http://localhost:8080/jsf-jmaki/index-demo.jsf");
if (timeoutHandler.isDidTimeout()) {
fail("timed out waiting for load");
}
// Choose the inplace test
mcp.blockingClickElement("inplace-test");
List<Element> anchors = mcp.getAnchors();
assertNotNull(anchors);
mcp.blockingClickElement(anchors.get(4));
scrollToBeginningOfResultSet(mcp, bitSet);

10
java/dist/netbeans/build.xml поставляемый
Просмотреть файл

@ -106,9 +106,9 @@
</and>
</condition>
<condition property="platform" value="mac">
<condition property="platform" value="macosx">
<and>
<os family="mac" />
<os name="Mac OS X" />
</and>
</condition>
@ -135,7 +135,7 @@
<condition property="build.mac.classes">
<and>
<isset property="platform" />
<equals arg1="${platform}" arg2="mac" />
<equals arg1="${platform}" arg2="macosx" />
</and>
</condition>
@ -173,7 +173,7 @@
</condition>
<uptodate property="do.copy.binaries">
<srcfiles dir="${basedir}/../bin" includes="**/*.*" />
<srcfiles dir="${basedir}/../bin/${platform}/bin" includes="**/*.*" />
<mapper type="identity" to="${browser.bin.dir}/**/*.*" />
</uptodate>
@ -203,7 +203,7 @@ ${so.prefix}xul.${so.extension}.
<target name="copy.binaries" if="do.copy.binaries">
<copy todir="${browser.bin.dir}">
<fileset dir="${basedir}/../bin" />
<fileset dir="${basedir}/../bin/${platform}/bin" />
</copy>
</target>

3
java/dist/netbeans/nbproject/project.properties поставляемый
Просмотреть файл

@ -22,7 +22,8 @@ file.reference.main-java-2=../src/main/java
file.reference.webclient-2_0_a8.jar=../lib/webclient-2_0_a8.jar
jar.compress=false
javac.classpath=\
${file.reference.webclient-2_0_a8.jar}
${file.reference.webclient-2_0_a8.jar}:\
${libs.junit.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false