diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java | 6 |
3 files changed, 33 insertions, 5 deletions
@@ -1,3 +1,15 @@ +2013-04-19 Jiri Vanek <[email protected]> + + testing server allowed from makefile + * Makefile.am: + (stamps/netx-dist-tests-prepare-reproducers.stamp) added stamps/netx-dist.stamp stamps/plugin.stamp dependence + (stamps/test-extensions-compile.stamp) added stamps/netx-dist.stamp stamps/plugin.stamp dependence + (stamps/compile-reproducers-testcases.stamp) added stamps/plugin.stamp dependence + (run-test-server-on-44321) new target, starts server in deploy dir, on port 44321 + (run-test-server-on-random-port) new target, starts server in deploy dir, on random port + * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: (main) + added better access to random port + 2013-04-17 Jiri Vanek <[email protected]> Added various self-describing tests for codebase diff --git a/Makefile.am b/Makefile.am index 791e3a6..e18353c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -641,7 +641,7 @@ stamps/junit-jnlp-dist-signed.stamp: mkdir -p stamps && \ touch $@ -stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/liveconnect-dist.stamp +stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/liveconnect-dist.stamp stamps/netx-dist.stamp stamps/plugin.stamp types=($(ALL_NONCUSTOM_REPRODUCERS)); \ for which in "$${types[@]}" ; do \ . $(abs_top_srcdir)/NEW_LINE_IFS ; \ @@ -754,7 +754,7 @@ netx-dist-tests-remove-cert-from-public: test-extensions-source-files.txt: find $(TEST_EXTENSIONS_SRCDIR) -name '*.java' | sort > $@ -stamps/test-extensions-compile.stamp: stamps/junit-jnlp-dist-dirs test-extensions-source-files.txt +stamps/test-extensions-compile.stamp: stamps/netx-dist.stamp stamps/plugin.stamp stamps/junit-jnlp-dist-dirs test-extensions-source-files.txt mkdir -p $(TEST_EXTENSIONS_DIR); mkdir -p $(NETX_TEST_DIR); ln -s $(TEST_EXTENSIONS_DIR) $(TEST_EXTENSIONS_COMPATIBILITY_SYMLINK); @@ -777,7 +777,7 @@ stamps/test-extensions-tests-compile.stamp: stamps/junit-jnlp-dist-dirs test-ext mkdir -p stamps && \ touch $@ -stamps/compile-reproducers-testcases.stamp: stamps/netx.stamp stamps/junit-jnlp-dist-dirs \ +stamps/compile-reproducers-testcases.stamp: stamps/netx-dist.stamp stamps/plugin.stamp stamps/junit-jnlp-dist-dirs \ test-extensions-source-files.txt stamps/test-extensions-compile.stamp stamps/test-extensions-tests-compile.stamp types=($(ALL_REPRODUCERS)); \ for which in "$${types[@]}" ; do \ @@ -1380,6 +1380,20 @@ else exit 5 endif +run-test-server-on-44321: stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \ + stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp + cd $(TEST_EXTENSIONS_DIR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \ + $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \ + -Xbootclasspath:$(RUNTIME) net.sourceforge.jnlp.ServerAccess + +run-test-server-on-random-port: stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \ + stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp + cd $(TEST_EXTENSIONS_DIR) ; \ + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \ + $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \ + -Xbootclasspath:$(RUNTIME) net.sourceforge.jnlp.ServerAccess randomport + clean-netx-tests: clean-netx-unit-tests clean-junit-runner clean-netx-dist-tests clean-test-code-coverage-jacoco clean-test-code-coverage if [ -e $(TESTS_DIR)/netx ]; then \ rmdir $(TESTS_DIR)/netx ; \ diff --git a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java index 6804faa..55ec17a 100644 --- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java +++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java @@ -138,8 +138,10 @@ public class ServerAccess { System.exit(0); } else { int port = 44321; - if (args.length > 0) { - port=new Integer(args[0]); + if (args.length > 0 && args[0].equalsIgnoreCase("randomport")) { + port = findFreePort(); + } else if (args.length > 0) { + port = new Integer(args[0]); } getIndependentInstance(port); while (true) { |