Swapping shell to JUnit tests

guilhermejccavalcanti · Aug 23, 2019 · ecd920c · ecd920c
1 parent 153efc8
commit ecd920c
Show file tree

Hide file tree

Showing 44 changed files with 290 additions and 7,806 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,17 +25,24 @@ before_install:
   - source ~/.install-jdk-travis.sh
 
   - ./gradlew clean build -x test --console=plain
-  
-  - cp build/libs/jFSTMerge-all.jar testfiles/shelltests/config/jFSTMerge.jar
+
+  - cp build/libs/jFSTMerge-all.jar ${HOME}/s3m.jar
   - bash testfiles/shelltests/config/gitconfiguration.sh
 
   - git config --global user.email "[email protected]"
   - git config --global user.name "Guilherme Cavalcanti" 
 
 script:
   - ./gradlew test --console=plain
-  - cd testfiles/shelltests/
-  - bash s3mGitIntegrationTests.sh
+  - cd testfiles/shelltests
+  - |
+    if [ "${TRAVIS_OS_NAME}" == "windows" ]; then
+      javac -cp .;dependencies/* s3mGitIntegrationTests.java;
+      java -cp .;dependencies/* org.junit.runner.JUnitCore s3mGitIntegrationTests;
+    else
+      javac -cp .:dependencies/* s3mGitIntegrationTests.java;
+      java -cp .:dependencies/* org.junit.runner.JUnitCore s3mGitIntegrationTests;
+    fi
 
 before_cache:
   - curl "${GRAVIS}.clean_gradle_cache.sh" --output ~/.clean_gradle_cache.sh

diff --git a/testfiles/shelltests/config/.gitconfig b/testfiles/shelltests/config/.gitconfig
@@ -2,5 +2,5 @@
     attributesfile = ~/.gitattributes
 [merge "s3m"]
     name = assert_conflict_states
-    driver = java -jar $HOME/jFSTMerge.jar -f %A %O %B -o %A -g
+    driver = java -jar $HOME/s3m.jar -f %A %O %B -o %A -g
 
diff --git a/testfiles/shelltests/config/gitconfiguration.sh b/testfiles/shelltests/config/gitconfiguration.sh
@@ -4,4 +4,3 @@ cd $parent_path
 
 cp .gitconfig $HOME
 cp .gitattributes $HOME
-cp jFSTMerge.jar $HOME
diff --git a/testfiles/shelltests/dependencies/commons-io-2.4.jar b/testfiles/shelltests/dependencies/commons-io-2.4.jar
diff --git a/testfiles/shelltests/dependencies/commons-lang3-3.9.jar b/testfiles/shelltests/dependencies/commons-lang3-3.9.jar
diff --git a/testfiles/shelltests/dependencies/hamcrest-1.3.jar b/testfiles/shelltests/dependencies/hamcrest-1.3.jar
diff --git a/testfiles/shelltests/dependencies/junit-4.12.jar b/testfiles/shelltests/dependencies/junit-4.12.jar
diff --git a/testfiles/shelltests/dependencies/shunit2-2.1.6/doc/CHANGES-2.1.txt b/testfiles/shelltests/dependencies/shunit2-2.1.6/doc/CHANGES-2.1.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ cd $parent_path

		cp .gitconfig $HOME
		cp .gitattributes $HOME
		cp jFSTMerge.jar $HOME