From 86eb23c7de820a29e14fda38cfdf7669b07a1de9 Mon Sep 17 00:00:00 2001
From: Scott Fennell <spfennell@gmail.com>
Date: Wed, 14 Mar 2018 10:29:44 -0500
Subject: [PATCH] #521 added unit tests to build and 3rd party XML formatter
 that does not rely on ant

---
 libexec/trick/java/lib/JUnitXmlFormatter.jar  | Bin 0 -> 17017 bytes
 libexec/trick/java/lib/Makefile               |   5 +-
 trick_source/java/test/Makefile               |  69 +++++++++++++++
 .../stripchart/StripchartApplicationTest.java |  79 ------------------
 .../WaitForStripchartApplication.java         |  57 -------------
 5 files changed, 73 insertions(+), 137 deletions(-)
 create mode 100644 libexec/trick/java/lib/JUnitXmlFormatter.jar
 create mode 100644 trick_source/java/test/Makefile
 delete mode 100644 trick_source/java/test/src/trick/stripchart/StripchartApplicationTest.java
 delete mode 100644 trick_source/java/test/src/trick/stripchart/WaitForStripchartApplication.java

diff --git a/libexec/trick/java/lib/JUnitXmlFormatter.jar b/libexec/trick/java/lib/JUnitXmlFormatter.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f931412c6c38fabda5f763e2a39ee612eed89736
GIT binary patch
literal 17017
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
DYSh{p

literal 0
HcmV?d00001

diff --git a/libexec/trick/java/lib/Makefile b/libexec/trick/java/lib/Makefile
index f3f3ca0d..f66ab9a0 100644
--- a/libexec/trick/java/lib/Makefile
+++ b/libexec/trick/java/lib/Makefile
@@ -15,7 +15,8 @@ EXTERNAL_JARS = \
     jfreesvg-2.1.jar \
     jopt-simple-4.8.jar \
     junit-4.12.jar \
-    swingx-1.6.1.jar
+    swingx-1.6.1.jar \
+    hamcrest-core-1.3.jar
 
 external_jars : ${EXTERNAL_JARS}
 
@@ -35,6 +36,8 @@ junit-4.12.jar:
 	curl -O http://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar
 swingx-1.6.1.jar :
 	curl -O http://repo.maven.apache.org/maven2/org/swinglabs/swingx/1.6.1/swingx-1.6.1.jar
+hamcrest-core-1.3.jar :
+	curl -O http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
 
 clean:
 	rm -f ${EXTERNAL_JARS}
diff --git a/trick_source/java/test/Makefile b/trick_source/java/test/Makefile
new file mode 100644
index 00000000..21db4aee
--- /dev/null
+++ b/trick_source/java/test/Makefile
@@ -0,0 +1,69 @@
+# To run new unit tests, add new tests to the "test" target
+
+TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..)
+
+# Get JAVAC definition
+include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+
+JAVAC ?= javac
+JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation
+# delineate 'javac -version' for version number 
+JAVAC_VERSION := $(shell ${JAVAC} -version 2>&1 | perl -ne 'print /(\d+)/')
+
+# include java.se.ee for JAXB xml annotations (for trick-tv) in java version 9
+ifeq ($(JAVAC_VERSION),9)
+	JAVAC_FLAGS += --add-modules java.se.ee
+endif
+
+SRC_DIR   = src
+SRC_FILES = $(shell find ${SRC_DIR} -type f -name \*.java)
+BUILD_DIR = build
+DEST_DIR  = ${BUILD_DIR}/classes
+LIB_DIR   = ${TRICK_HOME}/$(LIBEXEC)/trick/java/lib
+DIST_DIR  = ${TRICK_HOME}/$(LIBEXEC)/trick/java/dist
+TEST_DIR  = ${TRICK_HOME}/$(LIBEXEC)/trick/java/test
+
+empty :=
+space := $(empty) $(empty)
+CLASS_PATH = $(subst $(space),:,$(wildcard ${LIB_DIR}/*.jar):${DIST_DIR}/trick.jar)
+
+RESOURCES = $(subst src/,,$(shell find src/trick -name resources))
+RESOURCES += $(subst src/,,$(shell find src/trick -name jaxb.index))
+
+all: test
+	@echo "Java test successful"
+test: ${TEST_DIR}/test.jar
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_RunTimeTrickApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.common.RunTimeTrickApplicationTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_TrickApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.common.TrickApplicationTest
+	# java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_LogHeaderReaderTest.xml barrypitman.junitXmlFormatter.Runner trick.common.utils.LogHeaderReaderTest
+	# java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_UnitTypeTest.xml barrypitman.junitXmlFormatter.Runner trick.common.utils.UnitTypeTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_TrickDPApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.dataproducts.trickdp.TrickDPApplicationTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_TrickQPApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.dataproducts.trickqp.TrickQPApplicationTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_DreApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.dre.DreApplicationTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_MonteMonitorApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.montemonitor.MonteMonitorApplicationTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_MtvApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.mtv.MtvApplicationTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SieApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.sie.SieApplicationTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SimControlApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.simcontrol.SimControlApplicationTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SnifferApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.sniffer.SnifferApplicationTest
+	java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_TVApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.tv.TVApplicationTest
+
+${DEST_DIR} ${TEST_DIR}:
+	mkdir -p $@
+
+${TEST_DIR}/test.jar: compile ${TEST_DIR}
+	@echo "Creating jar file..."
+	@jar cf ${TEST_DIR}/test.jar -C ${DEST_DIR} .
+
+trick_guis:
+	@ $(MAKE) -C  ..
+
+compile: ${DEST_DIR} trick_guis
+	@echo "Building Trick GUI tests .."
+	@${JAVAC} ${JAVAC_FLAGS} -classpath ${CLASS_PATH} -d ${DEST_DIR} -sourcepath ${SRC_DIR} ${SRC_FILES}
+
+clean:
+	rm -rf ${BUILD_DIR}
+	rm -rf ${TEST_DIR}
+
+clean_obj:
+	rm -rf ${BUILD_DIR}
\ No newline at end of file
diff --git a/trick_source/java/test/src/trick/stripchart/StripchartApplicationTest.java b/trick_source/java/test/src/trick/stripchart/StripchartApplicationTest.java
deleted file mode 100644
index e793ddbe..00000000
--- a/trick_source/java/test/src/trick/stripchart/StripchartApplicationTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package trick.stripchart;
-
-import static org.junit.Assert.assertTrue;
-
-import org.jdesktop.application.Application;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import trick.common.CheckApplicationProperties;
-
-/**
- * 
- * Test StripchartApplication life cycle.
- * 
- * @author hchen
- *
- */
-public class StripchartApplicationTest {
-		
-	@BeforeClass
-	public static void setUpBeforeClass() throws Exception {		
-		WaitForStripchartApplication.launchAndWait(WaitForStripchartApplication.class);
-	}
-
-	@AfterClass
-	public static void tearDownAfterClass() throws Exception {
-	}
-
-	@Before
-	public void setUp() throws Exception {		
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-	
-	@Test
-	public void testReady() {		
-		assertTrue("StripchartApplicationTest is not ready yet!", application().isReady());
-	}
-	
-	/**
-     * Verify that all implemented actions exist as well as their text, shortDescription properties.
-     */
-    @Test
-    public void testDefinedActions() {
-        String[] actionNames = {"toggle_xrange", "start_stop", "legend_onoff", "postscript"};
-        String[] actionTexts = {"Toggle Range", "Toggle Start/Stop", "Legend On/Off", "Postscript..."};
-        String[] actionShortDescriptions = {"Set x-axis range to automatic scaling (All), or fixed-width (Strip).",
-        		                            "Start/Stop graph refreshing.",
-        		                            "Hide/Display the graph's Legend.",
-        		                            "Save a copy of the graph to postscript file."};
-        for (int i = 0; i < actionNames.length; i++) {            
-        	CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]);
-        	CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]);
-        	CheckApplicationProperties.checkActionShortDescription(application().actionMap, actionNames[i], actionShortDescriptions[i]);
-        }
-    }
-    
-    @Test
-    public void testDefinedKeyText() {
-    	CheckApplicationProperties.checkKeyText(application().resourceMap, "fileMenu.text", "&File");
-    	CheckApplicationProperties.checkKeyText(application().resourceMap, "settingsMenu.text", "&Settings");
-    }
-	
-	@Test
-	public void testExit() {
-		application().removeExitListener(application().exitListener);
-		application().exit();
-		assertTrue(application().isEnded);
-	}
-	
-	private static WaitForStripchartApplication application() {
-        return Application.getInstance(WaitForStripchartApplication.class);
-    }
-}
diff --git a/trick_source/java/test/src/trick/stripchart/WaitForStripchartApplication.java b/trick_source/java/test/src/trick/stripchart/WaitForStripchartApplication.java
deleted file mode 100644
index eb93845d..00000000
--- a/trick_source/java/test/src/trick/stripchart/WaitForStripchartApplication.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package trick.stripchart;
-
-
-import org.jdesktop.application.Application;
-
-
-public class WaitForStripchartApplication extends StripchartApplication {
-    static Object lock = new Object(); 
-    
-    boolean isEnded;
-    
-    @Override
-    protected void end() {
-    	isEnded = true;
-    }
-  
-    @Override
-    protected void ready() {
-    	super.ready();
-    	synchronized(lock) {
-    		lock.notifyAll();
-    	}
-    }
-    
-
-    /**
-     * Launch the specified subclsas of StripchartApplication and block
-     * (wait) until it's startup() method has run.
-     */
-    public static void launchAndWait(Class<? extends WaitForStripchartApplication> applicationClass) {
-    	synchronized(lock) {
-    		String[] args = new String[] {"-demo"};
-    		try {
-    			Application.launch(applicationClass, args);
-    		} catch (Exception e) {
-    			lock.notifyAll();
-    			return;
-    		}
-    		
-    		while(true) {
-    			try {
-    				lock.wait();
-    			}
-    			catch (InterruptedException e) {
-    				System.err.println("launchAndWait interrupted!");
-    				break;
-    			}
-    			Application app = Application.getInstance(WaitForStripchartApplication.class);
-    			if (app instanceof WaitForStripchartApplication) {
-    				if (((WaitForStripchartApplication)app).isReady()) {  
-    					break;
-    				}
-    			}
-    		}
-    	}
-    }
-}