shared test release

ivanesik · Jul 5, 2018 · 8300d38 · 8300d38
1 parent bc44c5b
commit 8300d38
Show file tree

Hide file tree

Showing 8 changed files with 323 additions and 23 deletions.
diff --git a/ModSwift.xcodeproj/project.pbxproj b/ModSwift.xcodeproj/project.pbxproj
@@ -9,9 +9,21 @@
 /* Begin PBXBuildFile section */
 		586037DA7437745911FAB5E6 /* Enums.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5860356FE565C3B22C5D8C18 /* Enums.swift */; };
 		58603AE5273B21227998B58D /* ModSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58603087D792F251503FE14F /* ModSwift.swift */; };
-		846CDB7B20E9F506005B86D8 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 846CDB7A20E9F506005B86D8 /* Model.swift */; };
+		843B4E6C20EDDC2E00965421 /* ModSwiftTcpTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 843B4E6B20EDDC2E00965421 /* ModSwiftTcpTest.swift */; };
+		843B4E6E20EDDC2E00965421 /* libModSwift.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 586030A215EC6361DDB57930 /* libModSwift.a */; };
+		843B4E8320EDE70B00965421 /* ModSwiftSharedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 843B4E8220EDE70B00965421 /* ModSwiftSharedTests.swift */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		843B4E6F20EDDC2E00965421 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 586036958B3C96BBD298CC4C /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5860385B6E1D3F0A45AEC5E9;
+			remoteInfo = ModSwift;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		5860374905045297649BDB7E /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -28,7 +40,10 @@
 		58603087D792F251503FE14F /* ModSwift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModSwift.swift; sourceTree = "<group>"; };
 		586030A215EC6361DDB57930 /* libModSwift.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libModSwift.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		5860356FE565C3B22C5D8C18 /* Enums.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enums.swift; sourceTree = "<group>"; };
-		846CDB7A20E9F506005B86D8 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
+		843B4E6920EDDC2E00965421 /* ModSwiftTest.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ModSwiftTest.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		843B4E6B20EDDC2E00965421 /* ModSwiftTcpTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModSwiftTcpTest.swift; sourceTree = "<group>"; };
+		843B4E6D20EDDC2E00965421 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		843B4E8220EDE70B00965421 /* ModSwiftSharedTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModSwiftSharedTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -39,13 +54,22 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		843B4E6620EDDC2E00965421 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				843B4E6E20EDDC2E00965421 /* libModSwift.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
 		586034764B2102C8978B30D4 /* Products */ = {
 			isa = PBXGroup;
 			children = (
 				586030A215EC6361DDB57930 /* libModSwift.a */,
+				843B4E6920EDDC2E00965421 /* ModSwiftTest.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -55,7 +79,6 @@
 			children = (
 				58603087D792F251503FE14F /* ModSwift.swift */,
 				5860356FE565C3B22C5D8C18 /* Enums.swift */,
-				846CDB7A20E9F506005B86D8 /* Model.swift */,
 			);
 			path = ModSwift;
 			sourceTree = "<group>";
@@ -65,9 +88,20 @@
 			children = (
 				586034764B2102C8978B30D4 /* Products */,
 				586034D8915A8A660319F3D6 /* ModSwift */,
+				843B4E6A20EDDC2E00965421 /* ModSwiftTest */,
 			);
 			sourceTree = "<group>";
 		};
+		843B4E6A20EDDC2E00965421 /* ModSwiftTest */ = {
+			isa = PBXGroup;
+			children = (
+				843B4E8220EDE70B00965421 /* ModSwiftSharedTests.swift */,
+				843B4E6B20EDDC2E00965421 /* ModSwiftTcpTest.swift */,
+				843B4E6D20EDDC2E00965421 /* Info.plist */,
+			);
+			path = ModSwiftTest;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -88,13 +122,39 @@
 			productReference = 586030A215EC6361DDB57930 /* libModSwift.a */;
 			productType = "com.apple.product-type.library.static";
 		};
+		843B4E6820EDDC2E00965421 /* ModSwiftTest */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 843B4E7320EDDC2E00965421 /* Build configuration list for PBXNativeTarget "ModSwiftTest" */;
+			buildPhases = (
+				843B4E6520EDDC2E00965421 /* Sources */,
+				843B4E6620EDDC2E00965421 /* Frameworks */,
+				843B4E6720EDDC2E00965421 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				843B4E7020EDDC2E00965421 /* PBXTargetDependency */,
+			);
+			name = ModSwiftTest;
+			productName = ModSwiftTest;
+			productReference = 843B4E6920EDDC2E00965421 /* ModSwiftTest.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		586036958B3C96BBD298CC4C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0940;
 				ORGANIZATIONNAME = "Ivan Elyoskin";
+				TargetAttributes = {
+					843B4E6820EDDC2E00965421 = {
+						CreatedOnToolsVersion = 9.4;
+						DevelopmentTeam = Y58337NXE2;
+						ProvisioningStyle = Automatic;
+					};
+				};
 			};
 			buildConfigurationList = 58603D13BEA65649DF7F598A /* Build configuration list for PBXProject "ModSwift" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -109,23 +169,50 @@
 			projectRoot = "";
 			targets = (
 				5860385B6E1D3F0A45AEC5E9 /* ModSwift */,
+				843B4E6820EDDC2E00965421 /* ModSwiftTest */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXResourcesBuildPhase section */
+		843B4E6720EDDC2E00965421 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		586037FC172F319644AC63D7 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				846CDB7B20E9F506005B86D8 /* Model.swift in Sources */,
 				58603AE5273B21227998B58D /* ModSwift.swift in Sources */,
 				586037DA7437745911FAB5E6 /* Enums.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		843B4E6520EDDC2E00965421 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				843B4E6C20EDDC2E00965421 /* ModSwiftTcpTest.swift in Sources */,
+				843B4E8320EDE70B00965421 /* ModSwiftSharedTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		843B4E7020EDDC2E00965421 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5860385B6E1D3F0A45AEC5E9 /* ModSwift */;
+			targetProxy = 843B4E6F20EDDC2E00965421 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		58603510E57A6CAA203729FA /* Release */ = {
 			isa = XCBuildConfiguration;
@@ -262,6 +349,34 @@
 			};
 			name = Release;
 		};
+		843B4E7120EDDC2E00965421 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = Y58337NXE2;
+				INFOPLIST_FILE = ModSwiftTest/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = temp.ModSwiftTest;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		843B4E7220EDDC2E00965421 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = Y58337NXE2;
+				INFOPLIST_FILE = ModSwiftTest/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = temp.ModSwiftTest;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -283,6 +398,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		843B4E7320EDDC2E00965421 /* Build configuration list for PBXNativeTarget "ModSwiftTest" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				843B4E7120EDDC2E00965421 /* Debug */,
+				843B4E7220EDDC2E00965421 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 586036958B3C96BBD298CC4C /* Project object */;

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ModSwift.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist b/ModSwift.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -9,6 +9,24 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>ModSwiftTest.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>5860385B6E1D3F0A45AEC5E9</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>843B4E6820EDDC2E00965421</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>
diff --git a/ModSwift/ModSwift.swift b/ModSwift/ModSwift.swift
@@ -19,7 +19,7 @@ import Foundation
 
 
 
-
+/// Class for generating modbus packages
 class  ModSwift {
 
     private var _mode: ModbusMode
@@ -47,7 +47,7 @@ class  ModSwift {
     ///
     /// - parameters:
     ///     - device: Modbus device 16-bit adress.
-    func setDevice(slaveAdress: UInt8 = 0x00) {
+    func setSlave(slaveAdress: UInt8 = 0x00) {
         _slaveAdress = slaveAdress
     }
 
@@ -74,6 +74,22 @@ class  ModSwift {
         return arr
     }
 
+    func getSlave() -> UInt8 {
+        return _slaveAdress
+    }
+
+    func getMode() -> ModbusMode {
+        return _mode
+    }
+
+    func getTransactionId() -> UInt16 {
+        return _transactId
+    }
+
+    func getProtocolId() -> UInt16 {
+        return _protocolId
+    }
+
 //***************************************************************************************************************
 //-Create-Package------------------------------------------------------------------------------------------------
 //***************************************************************************************************************

diff --git a/ModSwift/Model.swift b/ModSwift/Model.swift
diff --git a/ModSwiftTest/Info.plist b/ModSwiftTest/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>