MOBSDK-310, MOBSDK-467 & MOBSDK-468: Bamboo should use committed scri…

…pts to build and should produce JUnit test results so that Bamboo can properly report test results.

.gitignore

@@ -1,5 +1,6 @@
 xcuserdata
 AlfrescoSDK/build
-AlfrescoSDK/AlfrescoSDK/help
+AlfrescoSDK/AlfrescoSDKHelp
+AlfrescoSDK/test-reports
 
 

AlfrescoSDK/AlfrescoSDKTests/AlfrescoBaseTest.m

@@ -541,14 +541,12 @@ - (void) runAllSitesTest:(AlfrescoTestBlock)sessionTestBlock
             if (self.isCloud)
             {
                 AlfrescoLogInfo(@"Running test against Cloud server: %@ with username: %@", self.server, self.userName);
-//                [AlfrescoLog sharedInstance].logLevel = AlfrescoLogLevelTrace;
                 [self authenticateCloudServer];
                 [self resetTestVariables];
             }
             else
             {
                 AlfrescoLogInfo(@"Running test against OnPremise server: %@ with username: %@", self.server, self.userName);
-//                [AlfrescoLog sharedInstance].logLevel = AlfrescoLogLevelDebug;
                 [self authenticateOnPremiseServer];
                 [self resetTestVariables];
             }
@@ -574,7 +572,7 @@ - (void) runAllSitesTest:(AlfrescoTestBlock)sessionTestBlock
 
             [self removeTestDocument];
             [self resetTestVariables];
-            [self waitAtTheEnd];
+//            [self waitAtTheEnd];
         }
     }
 }

AlfrescoSDK/build_appledoc.sh

@@ -0,0 +1,9 @@
+rm -rf AlfrescoSDKHelp
+mkdir AlfrescoSDKHelp
+
+# Build documentation if appledoc is installed
+if type -p appledoc &>/dev/null; then
+    appledoc --project-name AlfrescoSDK --project-company "Alfresco" --company-id com.alfresco.alfrescosdk --output AlfrescoSDKHelp --keep-intermediate-files --exit-threshold 2 --ignore .m --ignore AlfrescoSDKTests . --ignore CMIS .
+else
+    echo "appledoc executable can not be found, you can find installation instuctions at https://github.com/tomaz/appledoc"
+fi

AlfrescoSDK/build_universal_lib.sh

@@ -1,8 +1,3 @@
 BUILD_UNIVERSAL_LIB='TRUE'
 export BUILD_UNIVERSAL_LIB
 xcodebuild -project AlfrescoSDK.xcodeproj -target AlfrescoSDK -configuration Debug clean build
-
-# Build documentation if appledoc is installed
-if type -p appledoc &>/dev/null; then
-    appledoc --project-name AlfrescoSDK --project-company "Alfresco" --company-id com.alfresco.alfrescosdk --output ./AlfrescoSDK/help --keep-intermediate-files --exit-threshold 2 --ignore .m --ignore AlfrescoSDKTests . --ignore CMIS .
-fi

AlfrescoSDK/run_test.sh

@@ -1 +1,20 @@
-xcodebuild -sdk iphonesimulator -project AlfrescoSDK.xcodeproj -target AlfrescoSDKTests -configuration Debug build
+#!/bin/bash
+
+# remove previous test reports
+if [ -d test-reports ]
+then
+  echo "Removing previous test-reports folder..."
+  rm -R test-reports
+fi
+
+# define the main command
+# TODO: Find a way to override the project TEST_AFTER_BUILD setting and set to YES
+BUILD_CMD="xcodebuild -sdk iphonesimulator -project AlfrescoSDK.xcodeproj -target AlfrescoSDKTests -configuration Debug build"
+
+# determine whether to pipe the unit tests results or not
+if [[ "$1" == "-output-junit-results" ]] ; then
+   echo "Tests are running, output is being piped to ocunit2junit, results will appear soon..."
+   $BUILD_CMD | ocunit2junit
+else
+   $BUILD_CMD
+fi