trackler 2.2.1.119 → 2.2.1.120

data/tracks/objective-c/exercises/strain/README.md

@@ -0,0 +1,48 @@
+# Strain
+
+Implement the keep and discard operation on collections. Given a collection and a predicate on the collection's elements, keep returns a new collection containing those elements where the predicate is true, while discard returns a new collection containing those elements where the predicate is false.
+
+For example, given the collection of numbers:
+
+1, 2, 3, 4, 5
+And the predicate:
+
+is the number even?
+Then your keep operation should produce:
+
+2, 4
+While your discard operation should produce:
+
+1, 3, 5
+Note that the union of keep and discard is all the elements.
+
+The functions may be called keep and discard, or they may need different names in order to not clash with existing functions or concepts in your language.
+
+Restrictions -
+
+The  filter/reject/whatchamacallit functionality provided by the standard library should not be used! This should be solved using other basic tools instead.
+
+## Setup
+
+There are two different methods of getting set up to run the tests with Objective-C:
+
+- Create an Xcode project with a test target which will run the tests.
+- Use the ruby gem `objc` as a test runner utility.
+
+Both are described in more detail here: http://exercism.io/languages/objective-c
+
+### Submitting Exercises
+
+When submitting an exercise, make sure your solution file is in the same directory as the test code.
+
+The submit command will look something like:
+
+```shell
+exercism submit <path-to-exercism-workspace>/objective-c/strain/Strain.m
+```
+
+You can find the Exercism workspace by running `exercism debug` and looking for the line beginning
+with Workspace.
+
+## Submitting Incomplete Solutions
+It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/objective-c/exercises/strain/StrainExample.h

@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+
+@interface NSArray (StrainExample)
+
+-(instancetype)keep:(BOOL)compare where:(BOOL (^)(id))completionHandler;
+
+-(instancetype)discard:(BOOL (^)(id))completionHandler;
+
+
+@end

data/tracks/objective-c/exercises/strain/StrainExample.m

@@ -0,0 +1,36 @@
+#import <Foundation/Foundation.h>
+#import "StrainExample.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation NSArray (StrainExample)
+
+-(instancetype)keep:(BOOL)compare where:(BOOL (^)(id))completionHandler{
+    
+    NSMutableArray *filteredArray = [NSMutableArray array];
+    
+    for(int index = 0;index < self.count;index++){
+        
+        id objectInArray = self[index];
+        
+        BOOL flag = completionHandler(objectInArray);
+        
+        if(flag == compare){
+            
+            [filteredArray addObject:objectInArray];
+        }
+    }
+    
+    return filteredArray;
+    
+}
+
+-(instancetype)discard:(BOOL (^)(id))completionHandler{
+    
+    return [self keep:false where:completionHandler];
+}
+
+
+@end
+
+NS_ASSUME_NONNULL_END

data/tracks/objective-c/exercises/strain/StrainTest.m

@@ -0,0 +1,233 @@
+#import <XCTest/XCTest.h>
+
+#if __has_include("StrainExample.h")
+# import "StrainExample.h"
+# else
+# import "Strain.h"
+#endif
+
+@interface StrainTest : XCTestCase
+
+@end
+
+@implementation StrainTest
+
+- (void)setUp {
+    [super setUp];
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+    [super tearDown];
+}
+
+- (void)testEmptyKeep {
+    
+    NSArray *inputArray = @[];
+    
+    NSArray *expectedArray = inputArray;
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray keep:true where:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSNumber *number = (NSNumber*)arrayElement;
+        int integerNumber = number.intValue;
+        return integerNumber < 10;
+        
+    }]);
+}
+
+- (void)testKeepEverything {
+    
+    NSArray *inputArray = @[@1,@2,@3];
+    
+    NSArray *expectedArray = inputArray;
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray keep:true where:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSNumber *number = (NSNumber*)arrayElement;
+        int integerNumber = number.intValue;
+        return integerNumber < 10;
+        
+    }]);
+}
+
+-(void)testKeepFirstAndLastElements {
+    
+    NSArray *inputArray = @[@1,@2,@3];
+    
+    NSArray *expectedArray = @[@1,@3];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray keep:true where:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSNumber *number = (NSNumber*)arrayElement;
+        int integerNumber = number.intValue;
+        return integerNumber % 2 != 0;
+        
+    }]);
+}
+
+-(void)testKeepNeitherFirstNorLastElement {
+    
+    NSArray *inputArray = @[@1,@2,@3,@4,@5];
+    
+    NSArray *expectedArray = @[@2,@4];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray keep:true where:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSNumber *number = (NSNumber*)arrayElement;
+        int integerNumber = number.intValue;
+        return integerNumber % 2 == 0;
+        
+    }]);
+}
+
+-(void)testKeepStrings {
+    
+    NSArray *inputArray = @[@"apple",@"zebra",@"banana",@"Zombies",@"cherimoya",@"zealot"];
+    
+    NSArray *expectedArray = @[@"zebra",@"Zombies",@"zealot"];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray keep:true where:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSString *string = (NSString*)arrayElement;
+        
+        return ([string rangeOfString:@"z"].location != NSNotFound || [string rangeOfString:@"Z"].location != NSNotFound);
+        
+    }]);
+}
+
+-(void)testKeepArrays {
+    
+    NSArray *inputArray = @[@[@1,@2,@3],@[@5,@5,@5],@[@5,@1,@2],@[@2,@1,@2],@[@1,@5,@2],@[@2,@2,@1],@[@1,@2,@5]];
+    
+    NSArray *expectedArray = @[@[@5,@5,@5],@[@5,@1,@2],@[@1,@5,@2],@[@1,@2,@5]];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray keep:true where:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSArray *nestedArray = (NSArray*)arrayElement;
+        return [nestedArray containsObject:@5];
+        
+    }]);
+   
+}
+
+-(void)testDiscardEmptyArray {
+    
+    NSArray *inputArray = @[];
+    
+    NSArray *expectedArray = inputArray;
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray discard:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSNumber *number = (NSNumber*)arrayElement;
+        int integerNumber = number.intValue;
+        return integerNumber < 10;
+        
+    }]);
+    
+}
+
+-(void)testDiscardNothing {
+    
+    NSArray *inputArray = @[@1,@2,@3];
+    
+    NSArray *expectedArray = inputArray;
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray discard:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSNumber *number = (NSNumber*)arrayElement;
+        int integerNumber = number.intValue;
+        return integerNumber > 10;
+        
+    }]);
+}
+
+-(void)testDiscardFirstAndLastElements {
+    
+    NSArray *inputArray = @[@1,@2,@3];
+    
+    NSArray *expectedArray = @[@2];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray discard:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSNumber *number = (NSNumber*)arrayElement;
+        int integerNumber = number.intValue;
+        return integerNumber % 2 != 0;
+        
+    }]);
+}
+
+-(void)testDiscardNeitherFirstNorLastElement {
+    
+    NSArray *inputArray = @[@1,@2,@3,@4,@5];
+    
+    NSArray *expectedArray = @[@1,@3,@5];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray discard:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSNumber *number = (NSNumber*)arrayElement;
+        int integerNumber = number.intValue;
+        return integerNumber % 2 == 0;
+        
+    }]);
+}
+
+-(void)testDiscardStrings {
+    
+    NSArray *inputArray = @[@"apple",@"zebra",@"banana",@"Zombies",@"cherimoya",@"zealot"];
+    
+    NSArray *expectedArray = @[@"apple",@"banana",@"cherimoya"];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray discard:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSString *string = (NSString*)arrayElement;
+        
+        return ([string rangeOfString:@"z"].location != NSNotFound || [string rangeOfString:@"Z"].location != NSNotFound);
+      
+    }]);
+}
+
+-(void)testDiscardArrays {
+    
+    NSArray *inputArray = @[@[@1,@2,@3],@[@5,@5,@5],@[@5,@1,@2],@[@2,@1,@2],@[@1,@5,@2],@[@2,@2,@1],@[@1,@2,@5]];
+    
+    NSArray *expectedArray = @[@[@1,@2,@3],@[@2,@1,@2],@[@2,@2,@1]];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray discard:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSArray *nestedArray = (NSArray*)arrayElement;
+        return [nestedArray containsObject:@5];
+        
+    }]);
+}
+
+-(void)testKeepOnMutableArrays {
+    
+    NSMutableArray *inputArray = [NSMutableArray arrayWithObjects:@[@1,@2,@3],@[@5,@5,@5],@[@5,@1,@2],@[@2,@1,@2],@[@1,@5,@2],@[@2,@2,@1],@[@1,@2,@5], nil];
+    
+    NSArray *expectedArray = @[@[@5,@5,@5],@[@5,@1,@2],@[@1,@5,@2],@[@1,@2,@5]];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray keep:true where:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSArray *nestedArray = (NSArray*)arrayElement;
+        return [nestedArray containsObject:@5];
+        
+    }]);
+}
+
+-(void)testDiscardOnMutableArrays {
+    
+    NSMutableArray *inputArray = [NSMutableArray arrayWithObjects:@[@1,@2,@3],@[@5,@5,@5],@[@5,@1,@2],@[@2,@1,@2],@[@1,@5,@2],@[@2,@2,@1],@[@1,@2,@5], nil];
+    
+    NSArray *expectedArray = @[@[@1,@2,@3],@[@2,@1,@2],@[@2,@2,@1]];
+    
+    XCTAssertEqualObjects(expectedArray, [inputArray discard:^BOOL(id  _Nonnull arrayElement) {
+        
+        NSArray *nestedArray = (NSArray*)arrayElement;
+        return [nestedArray containsObject:@5];
+        
+    }]);
+}
+
+@end

data/tracks/objective-c/xcodeProject/ObjectiveC.xcodeproj/project.pbxproj

@@ -57,6 +57,8 @@
 		A09A4C051E38763300FEFB7A /* FlattenArrayTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A09A4C041E38763300FEFB7A /* FlattenArrayTest.m */; };
 		A0BBFCBF1E37719800230071 /* SublistExample.m in Sources */ = {isa = PBXBuildFile; fileRef = A0BBFCBE1E37719800230071 /* SublistExample.m */; };
 		A0BBFCC31E37728100230071 /* SublistTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A0BBFCC21E37728100230071 /* SublistTest.m */; };
+		A0CFCBF82056956B00DFE959 /* StrainExample.m in Sources */ = {isa = PBXBuildFile; fileRef = A0CFCBF52056956A00DFE959 /* StrainExample.m */; };
+		A0CFCBF92056956B00DFE959 /* StrainTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A0CFCBF62056956A00DFE959 /* StrainTest.m */; };
 		E90343B62041F989006F1833 /* PrimeFactorsExample.m in Sources */ = {isa = PBXBuildFile; fileRef = E90343B52041F989006F1833 /* PrimeFactorsExample.m */; };
 		E90343BC20447437006F1833 /* PrimeFactorsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E90343BB20447437006F1833 /* PrimeFactorsTest.m */; };
 		E907D0CA1D6B731600106C42 /* GigasecondExample.m in Sources */ = {isa = PBXBuildFile; fileRef = E907D0C91D6B731600106C42 /* GigasecondExample.m */; };
@@ -174,6 +176,9 @@
 		A0BBFCBD1E37719800230071 /* SublistExample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SublistExample.h; path = ../../exercises/sublist/SublistExample.h; sourceTree = "<group>"; };
 		A0BBFCBE1E37719800230071 /* SublistExample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SublistExample.m; path = ../../exercises/sublist/SublistExample.m; sourceTree = "<group>"; };
 		A0BBFCC21E37728100230071 /* SublistTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SublistTest.m; path = ../../exercises/sublist/SublistTest.m; sourceTree = "<group>"; };
+		A0CFCBF52056956A00DFE959 /* StrainExample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StrainExample.m; path = ../../exercises/strain/StrainExample.m; sourceTree = "<group>"; };
+		A0CFCBF62056956A00DFE959 /* StrainTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StrainTest.m; path = ../../exercises/strain/StrainTest.m; sourceTree = "<group>"; };
+		A0CFCBF72056956A00DFE959 /* StrainExample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StrainExample.h; path = ../../exercises/strain/StrainExample.h; sourceTree = "<group>"; };
 		E90343B42041F989006F1833 /* PrimeFactorsExample.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PrimeFactorsExample.h; path = "../../exercises/prime-factors/PrimeFactorsExample.h"; sourceTree = "<group>"; };
 		E90343B52041F989006F1833 /* PrimeFactorsExample.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PrimeFactorsExample.m; path = "../../exercises/prime-factors/PrimeFactorsExample.m"; sourceTree = "<group>"; };
 		E90343BB20447437006F1833 /* PrimeFactorsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PrimeFactorsTest.m; path = "../../exercises/prime-factors/PrimeFactorsTest.m"; sourceTree = "<group>"; };
@@ -318,6 +323,7 @@
 				E90E59C720489199008C0FB5 /* Series */,
 				E97320091E9DA06500ABEE5C /* Sieve */,
 				E9E8B6F61D519E340012F12C /* SpaceAge */,
+				A0CFCBEF20568C3F00DFE959 /* Strain */,
 				A0BBFCBC1E37703D00230071 /* Sublist */,
 				E99D1D7B1D5532C50006A303 /* SumOfMultiples */,
 				E96993951DF60DF1009EA223 /* Transpose */,
@@ -396,6 +402,16 @@
 			name = BeerSong;
 			sourceTree = "<group>";
 		};
+		A0CFCBEF20568C3F00DFE959 /* Strain */ = {
+			isa = PBXGroup;
+			children = (
+				A0CFCBF72056956A00DFE959 /* StrainExample.h */,
+				A0CFCBF52056956A00DFE959 /* StrainExample.m */,
+				A0CFCBF62056956A00DFE959 /* StrainTest.m */,
+			);
+			name = Strain;
+			sourceTree = "<group>";
+		};
 		E90343B32041F93F006F1833 /* PrimeFactors */ = {
 			isa = PBXGroup;
 			children = (
@@ -893,7 +909,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -f ~/.bash_profile ]; then\nsource ~/.bash_profile\nfi\n\nhash oclint &> /dev/null\nif [ $? -eq 1 ]; then\necho >&2 \"oclint not found, analyzing stopped\"\nexit 1\nfi\n\nif [ ! -f \"${TARGET_TEMP_DIR}\"/xcodebuild.log ]; then\necho \"[*] xcodebuild.log not found, possibly clean was performed\"\necho \"[*] starting xcodebuild to rebuild the project..\"\n\ncd \"${SRCROOT}\"\n\nxcodebuild clean -configuration \"${CONFIGURATION}\" -project \"${PROJECT_NAME}\".xcodeproj\n\n#build xcodebuild.log\nxcodebuild -configuration \"${CONFIGURATION}\" -project \"${PROJECT_NAME}\".xcodeproj | tee \"${TARGET_TEMP_DIR}\"/xcodebuild.log\nfi\n\ncd \"${TARGET_TEMP_DIR}\"\n\necho \"[*] transforming xcodebuild.log into compile_commands.json...\"\n#transform it into compile_commands.json\noclint-xcodebuild\n\necho \"[*] starting analyzing\"\noclint-json-compilation-database -- \\\n   -rc LONG_LINE=200 -disable-rule UselessParentheses -disable-rule ConstantConditionalOperator -disable-rule DoubleNegative -disable-rule MultipleUnaryOperator -p \"${TARGET_TEMP_DIR}\" \\\n    | sed -E 's/(.*\\.(c|m{1,2}):[0-9]*:[0-9]*:)/\\1 warning:/'";
+			shellScript = "if [ -f ~/.profile ]; then\nsource ~/.profile\nfi\n\nhash oclint &> /dev/null\nif [ $? -eq 1 ]; then\necho >&2 \"oclint not found, analyzing stopped\"\nexit 1\nfi\n\nif [ ! -f \"${TARGET_TEMP_DIR}\"/xcodebuild.log ]; then\necho \"[*] xcodebuild.log not found, possibly clean was performed\"\necho \"[*] starting xcodebuild to rebuild the project..\"\n\ncd \"${SRCROOT}\"\n\nxcodebuild clean -configuration \"${CONFIGURATION}\" -project \"${PROJECT_NAME}\".xcodeproj\n\n#build xcodebuild.log\nxcodebuild -configuration \"${CONFIGURATION}\" -project \"${PROJECT_NAME}\".xcodeproj | tee \"${TARGET_TEMP_DIR}\"/xcodebuild.log\nfi\n\ncd \"${TARGET_TEMP_DIR}\"\n\necho \"[*] transforming xcodebuild.log into compile_commands.json...\"\n#transform it into compile_commands.json\noclint-xcodebuild\n\necho \"[*] starting analyzing\"\noclint-json-compilation-database -- \\\n   -rc LONG_LINE=200 -disable-rule UselessParentheses -disable-rule ConstantConditionalOperator -disable-rule DoubleNegative -disable-rule MultipleUnaryOperator -p \"${TARGET_TEMP_DIR}\" \\\n    | sed -E 's/(.*\\.(c|m{1,2}):[0-9]*:[0-9]*:)/\\1 warning:/'";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -904,6 +920,7 @@
 			files = (
 				1EFACAA71CCCAF3D006F2E69 /* EtlExample.m in Sources */,
 				1EFACAA31CCCAF3D006F2E69 /* AnagramExample.m in Sources */,
+				A0CFCBF92056956B00DFE959 /* StrainTest.m in Sources */,
 				E9B062201E9E7C6D000BE589 /* SieveTest.m in Sources */,
 				E94ACA131D41760300D56CC2 /* AllYourBaseExample.m in Sources */,
 				E94ACA151D41763800D56CC2 /* AllYourBaseTest.m in Sources */,
@@ -950,6 +967,7 @@
 				E9C1C0311D9EC1270015E86E /* RunLengthEncodingTest.m in Sources */,
 				1EFACAA81CCCAF3D006F2E69 /* EtlTest.m in Sources */,
 				A097D40F1E363C2700EAF2C2 /* BracketPushExample.m in Sources */,
+				A0CFCBF82056956B00DFE959 /* StrainExample.m in Sources */,
 				E947A4E01D81FE3A00633720 /* TriangleTest.m in Sources */,
 				1EFACAA91CCCAF3D006F2E69 /* GradeSchoolExample.m in Sources */,
 				1EFACABA1CCCAF3D006F2E69 /* SpaceAgeTest.m in Sources */,

data/tracks/scala/exercises/robot-simulator/src/test/scala/RobotSimulatorTest.scala

@@ -1,6 +1,6 @@
 import org.scalatest.{Matchers, FunSuite}
 
-/** @version 1.0.0 */
+/** @version 2.2.0 */
 class RobotSimulatorTest extends FunSuite with Matchers {
 
   test(

data/tracks/scala/testgen/src/main/scala/RobotSimulatorTestGenerator.scala

@@ -7,18 +7,25 @@ object RobotSimulatorTestGenerator {
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/robot-simulator.json")
 
-    def getPositionArgs(robotMap: Map[String, String]): String =
-      robotMap("position").stripPrefix("(").stripSuffix(")")
-
-    def getRobotMap(labeledTest: LabeledTest): Map[String, String] = {
-      labeledTest.result("robot").
-        asInstanceOf[Map[String, String]]
+    def getPosition(labeledTest: LabeledTest): (Int, Int) = {
+      val inputMap = fromInputMap(labeledTest.result, "position")
+        .asInstanceOf[Map[String, Any]]
+      getPosition2(inputMap)
     }
 
-    def getExpectedMap(labeledTest: LabeledTest): Map[String, String] = {
-      labeledTest.result("expected").
-        asInstanceOf[Map[String, String]]
-    }
+    def getPosition2(positionMap: Map[String, Any]): (Int, Int) =
+      (positionMap("x").asInstanceOf[Int], positionMap("y").asInstanceOf[Int])
+
+
+    def getDirection(labeledTest: LabeledTest): String =
+      fromInputMap(labeledTest.result, "direction").toString
+
+    def toPositionArgs(position: (Int, Int)): String =
+      s"${position._1}, ${position._2}"
+
+
+    def getExpectedMap(labeledTest: LabeledTest): Map[String, Any] =
+      labeledTest.result("expected").asInstanceOf[Map[String, Any]]
 
     def directionToBearing(direction: String): String =
       direction.toLowerCase match {
@@ -29,18 +36,19 @@ object RobotSimulatorTestGenerator {
       }
 
     def toCreateSutCall(labeledTest: LabeledTest): String = {
-      val robotMap = getRobotMap(labeledTest)
-      val bearing = directionToBearing(robotMap("direction"))
-      s"Robot($bearing, (${getPositionArgs(robotMap)}))"
+      val bearing = directionToBearing(getDirection(labeledTest))
+      s"Robot($bearing, (${toPositionArgs(getPosition(labeledTest))}))"
     }
 
     def toCreateExpected(labeledTest: LabeledTest): String = {
       val robotMap = getExpectedMap(labeledTest)
-      val bearing = directionToBearing(robotMap("direction"))
-      s"Robot($bearing, (${getPositionArgs(robotMap)}))"
+      val bearing = directionToBearing(robotMap("direction").toString)
+      val positionArgs = toPositionArgs(getPosition2(robotMap("position")
+        .asInstanceOf[Map[String, Int]]))
+      s"Robot($bearing, ($positionArgs))"
     }
 
-    def toTurnFunction(map: Map[String, String]) =
+    def toTurnFunction(map: Map[String, Any]) =
       map.get("direction") match {
         case Some(_) => "bearing"
         case None => "coordinates"
@@ -54,15 +62,18 @@ object RobotSimulatorTestGenerator {
 
     def toTurnExpected(labeledTest: LabeledTest): String = {
       val expected = getExpectedMap(labeledTest)
+      expected.foreach{case (k, v) => System.out.println(s"$k")}
       expected.get("direction") match {
-        case Some(s) => directionToBearing(s)
-        case None => s"(${getPositionArgs(expected)})"
+        case Some(s: String) => directionToBearing(s)
+        case None => {
+          val positionMap = expected("position").asInstanceOf[Map[String, Int]]
+          s"(${toPositionArgs(getPosition2(positionMap))})"
+        }
       }
     }
 
     def toInstructSutCall(labeledTest: LabeledTest): String = {
-      val property = labeledTest.property
-      val instructions = labeledTest.result("instructions")
+      val instructions = fromInputMap(labeledTest.result, "instructions")
       s"""${toCreateSutCall(labeledTest)}.simulate("$instructions")"""
     }