Added test to in Resources test suite

Author: isc-eneil

tests/integration_tests/Test/PM/Integration/Resources.cls

@@ -3,65 +3,121 @@ Class Test.PM.Integration.Resources Extends Test.PM.Integration.Base
 
 Parameter NEEDSREGISTRY = 0;
 
-Method TestResourceTypes()
+Parameter ResourceTestIRISHealthMod = "ResourceTestIRISHealth";
+
+Parameter ResourceTestIRISMod = "ResourceTestIRIS";
+
+Method TestResourceTypesOnIRISForHealth()
 {
-	New $Namespace
-	Set oldNamespace = $Namespace
+	new $namespace
+	set oldNamespace = $namespace
 
-	If ('$ListFind($system.Version.GetISCComponents(), "Health")) {
-		Do $$$AssertSkipped("This test only runs on IRIS for Health, which has all resource types available.")
-		Quit $$$OK
+	if ('$listfind($system.Version.GetISCComponents(), "Health")) {
+		do $$$AssertSkipped("This test only runs on IRIS for Health, which has all resource types available.")
+		quit $$$OK
 	}
 
-	Set tSC = $$$OK
-	Try {
-		Set tTestRoot = $Get(^UnitTestRoot)
+	set tSC = $$$OK
+	try {
+		set tTestRoot = $get(^UnitTestRoot)
 
-		If '$$$AssertStatusOK(..Setup()) {
-			Quit
+		if '$$$AssertStatusOK(..Setup()) {
+			quit
 		}
-		Set $Namespace = ..#CLIENTNS
-		
+		set $namespace = ..#CLIENTNS
+
 		// Uninstall. This might fail; if it does that's fine.
-		Do ##class(%IPM.Storage.Module).Uninstall("ResourceTest",1,1)
-		
-		Set tParams("Verbose") = 1
-		Set tModuleDirectory = ##class(%File).NormalizeDirectory("_data/resource-test", tTestRoot)
-		Set tSC = ##class(%IPM.Utils.Module).LoadModuleFromDirectory(tModuleDirectory,.tParams)
-		Do $$$AssertStatusOK(tSC,"Loaded ResourceTest module successfully.")
-		
-		For tClass = "ResourceTest.MyClass","ResourceTest.APackage.SomeClass" {
-			Do $$$AssertTrue($$$defClassDefined(tClass),tClass_" exists.")
+		do ##class(%IPM.Storage.Module).Uninstall(..#ResourceTestIRISHealthMod,1,1)
+
+		set tParams("Verbose") = 1
+		set tModuleDirectory = ##class(%File).NormalizeDirectory("_data/resource-tests/resource-test-irishealth", tTestRoot)
+		set tSC = ##class(%IPM.Utils.Module).LoadModuleFromDirectory(tModuleDirectory,.tParams)
+		do $$$AssertStatusOK(tSC,"Loaded ResourceTest module successfully.")
+
+		for tClass = "ResourceTest.MyClass","ResourceTest.APackage.SomeClass", "ResourceTest.TestIncludeLoads" {
+			do $$$AssertTrue($$$defClassDefined(tClass),tClass_" exists.")
 		}
-		
-		For tClass = "ResourceTest.MyClass","ResourceTest.APackage.SomeClass" {
-			Do $$$AssertTrue($$$comClassDefined(tClass),tClass_" has been compiled.")
+
+		for tClass = "ResourceTest.MyClass","ResourceTest.APackage.SomeClass", "ResourceTest.TestIncludeLoads" {
+			do $$$AssertTrue($$$comClassDefined(tClass),tClass_" has been compiled.")
 		}
-		
+
 		#; For tUserDoc = "Sample Operational Reports-Auditing Overview.dashboard.DFI","Demo.HL7.MsgRouter.Schema.HL7" {
 		#; 	Do $$$AssertTrue(##class(%RoutineMgr).Exists(tUserDoc),tUserDoc_" exists.")
 		#; }
-		
-		Do $$$AssertEquals($Get(^ResourceTest),"Hello World","^ResourceTest was imported properly.")
-		
-		Do $$$AssertEquals($$MyFunction^ResourceTest(),42,"ResourceTest routine exists and was compiled (and, by extension, ResourceTest.inc as well).")
+
+		do $$$AssertEquals($get(^ResourceTest),"Hello World","^ResourceTest was imported properly.")
+
+		do $$$AssertEquals($$MyFunction^ResourceTest(),42,"ResourceTest routine exists and was compiled (and, by extension, ResourceTest.inc as well).")
+
+		// Assert that ownership of .INC files is appropriate
+		&sql(select ID into :rrID from %IPM_Storage.ResourceReference where ModuleItem->Name = 'ResourceTestIRISHealth' and Name = 'ResourceTest.APackage.PKG')
+		$$$ThrowSQLIfError(SQLCODE,%message)
+		set rr = ##class(%IPM.Storage.ResourceReference).%OpenId(rrID,,.sc)
+		$$$ThrowOnError(sc)
+		do $$$AssertStatusOK(rr.ResolveChildren(.res))
+		if $$$AssertTrue($data(res("ResourceTest.APackage.IncludeFile.inc"))) {
+			do $$$AssertEquals(res("ResourceTest.APackage.IncludeFile.inc","RelativePath"),"cls/ResourceTest/APackage/IncludeFile.inc")
+		}
+		do $$$AssertNotTrue($data(res("ResourceTest.APackage.AnotherIncludeFile.inc")))
+	} catch e {
+		do $$$AssertStatusOK(e.AsStatus(),"An exception occurred.")
+	}
+
+	set $namespace = oldNamespace
+	do ..TearDown()
+}
+
+Method TestResourceTypesOnIRIS()
+{
+	new $namespace
+	set oldNamespace = $namespace
+
+	set tSC = $$$OK
+	try {
+		set tTestRoot = $get(^UnitTestRoot)
+
+		if '$$$AssertStatusOK(..Setup()) {
+			quit
+		}
+		set $namespace = ..#CLIENTNS
+
+		// Uninstall. This might fail; if it does that's fine.
+		do ##class(%IPM.Storage.Module).Uninstall(..#ResourceTestIRISMod,1,1)
+
+		set tParams("Verbose") = 1
+		set tModuleDirectory = ##class(%File).NormalizeDirectory("_data/resource-tests/resource-test-iris", tTestRoot)
+		set tSC = ##class(%IPM.Utils.Module).LoadModuleFromDirectory(tModuleDirectory,.tParams)
+		do $$$AssertStatusOK(tSC,"Loaded ResourceTest module successfully.")
+
+		for tClass = "ResourceTest.MyClass","ResourceTest.APackage.SomeClass", "ResourceTest.TestIncludeLoads" {
+			do $$$AssertTrue($$$defClassDefined(tClass),tClass_" exists.")
+		}
+
+		for tClass = "ResourceTest.MyClass","ResourceTest.APackage.SomeClass", "ResourceTest.TestIncludeLoads" {
+			do $$$AssertTrue($$$comClassDefined(tClass),tClass_" has been compiled.")
+		}
+
+		do $$$AssertEquals($get(^ResourceTest),"Hello World","^ResourceTest was imported properly.")
+
+		do $$$AssertEquals($$MyFunction^ResourceTest(),42,"ResourceTest routine exists and was compiled (and, by extension, ResourceTest.inc as well).")
 
 		// Assert that ownership of .INC files is appropriate
-		&sql(select ID into :rrID from %IPM_Storage.ResourceReference where ModuleItem->Name = 'ResourceTest' and Name = 'ResourceTest.APackage.PKG')
+		&sql(select ID into :rrID from %IPM_Storage.ResourceReference where ModuleItem->Name = 'ResourceTestIRIS' and Name = 'ResourceTest.APackage.PKG')
 		$$$ThrowSQLIfError(SQLCODE,%message)
-		Set rr = ##class(%IPM.Storage.ResourceReference).%OpenId(rrID,,.sc)
+		set rr = ##class(%IPM.Storage.ResourceReference).%OpenId(rrID,,.sc)
 		$$$ThrowOnError(sc)
-		Do $$$AssertStatusOK(rr.ResolveChildren(.res))
-		If $$$AssertTrue($Data(res("ResourceTest.APackage.IncludeFile.inc"))) {
-			Do $$$AssertEquals(res("ResourceTest.APackage.IncludeFile.inc","RelativePath"),"cls/ResourceTest/APackage/IncludeFile.inc")
+		do $$$AssertStatusOK(rr.ResolveChildren(.res))
+		if $$$AssertTrue($data(res("ResourceTest.APackage.IncludeFile.inc"))) {
+			do $$$AssertEquals(res("ResourceTest.APackage.IncludeFile.inc","RelativePath"),"cls/ResourceTest/APackage/IncludeFile.inc")
 		}
-		Do $$$AssertNotTrue($Data(res("ResourceTest.APackage.AnotherIncludeFile.inc")))
-	} Catch e {
-		Do $$$AssertStatusOK(e.AsStatus(),"An exception occurred.")
+		do $$$AssertNotTrue($data(res("ResourceTest.APackage.AnotherIncludeFile.inc")))
+	} catch e {
+		do $$$AssertStatusOK(e.AsStatus(),"An exception occurred.")
 	}
 
-	Set $Namespace = oldNamespace
-	Do ..TearDown()
+	set $namespace = oldNamespace
+	do ..TearDown()
 }
 
 }

…tegration/_data/resource-test/.gitignore …urce-tests/resource-test-iris/.gitignoretests/integration_tests/Test/PM/Integration/_data/resource-test/.gitignore renamed to tests/integration_tests/Test/PM/Integration/_data/resource-tests/resource-test-iris/.gitignore tests/integration_tests/Test/PM/Integration/_data/resource-test/.gitignore renamed to tests/integration_tests/Test/PM/Integration/_data/resource-tests/resource-test-iris/.gitignore

@@ -0,0 +1,12 @@
+Include ResourceTest.NestedInclude
+
+Class ResourceTest.TestIncludeLoads
+{
+
+ClassMethod CallIncludeMacro()
+{
+    write !, "I call the macro within SimpleApp.NestedInclude.inc"
+    write !, $$$TestMacro
+}
+
+}