Cleanup test inputs

Author: hlopko

test/Interop/Cxx/templates/Inputs/SwiftClassInstantiationModule.swift

@@ -1,4 +1,4 @@
-import ClassTemplates
+import MagicWrapper
 
 public func makeWrappedMagicNumber() -> MagicWrapper<IntWrapper> {
   let t = IntWrapper(value: 42)

test/Interop/Cxx/templates/Inputs/magic-wrapper.h

@@ -4,15 +4,12 @@
 template<class T>
 struct MagicWrapper {
   T t;
-  int callGetInt() const {
-    return t.getInt() + 5;
-  }
+  int getValuePlusArg(int arg) const { return t.getValue() + arg; }
 };
 
-struct MagicNumber {
-  int getInt() const { return 12; }
+struct IntWrapper {
+  int value;
+  int getValue() const { return value; }
 };
 
-using WrappedMagicNumber = MagicWrapper<MagicNumber>;
-
 #endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_MAGIC_WRAPPER_H

test/Interop/Cxx/templates/instantiation-in-swift.swift

@@ -2,16 +2,15 @@
 //
 // REQUIRES: executable_test
 
-import MagicWrapper
+import UsingDirective
 import StdlibUnittest
 
 var TemplatesTestSuite = TestSuite("TemplatesTestSuite")
 
 TemplatesTestSuite.test("without-definition") {
-  let magicNumber = MagicNumber()
-  // var wrappedMagicNumber = MagicWrapper<MagicNumber>(t: magicNumber)
-  var wrappedMagicNumber = MagicWrapper<MagicNumber>()
-  expectEqual(wrappedMagicNumber.callGetInt(), 17)
+  var intWrapper = IntWrapper(value: 42)
+  var wrappedMagicNumber = MagicWrapper<IntWrapper>(t: intWrapper)
+  expectEqual(wrappedMagicNumber.getValuePlusArg(8), 50)
 }
 
 runAllTests()

test/Interop/Cxx/templates/swift-class-instantiation-module-interface.swift

@@ -3,7 +3,7 @@
 // RUN: tree %t
 // RUN: %target-swift-ide-test -print-module -module-to-print=SwiftClassInstantiationModule -I %t -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
 
-// CHECK: import ClassTemplates
+// CHECK: import MagicWrapper
 // CHECK: import SwiftOnoneSupport
 
 // CHECK: func makeWrappedMagicNumber() -> __CxxTemplateInst12MagicWrapperI10IntWrapperE