Fix templat-template-parameter test

Author: hlopko

test/Interop/Cxx/templates/Inputs/template-template-parameter.h

@@ -1,21 +1,23 @@
 #ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_TEMPLATE_TEMPLATE_PARAMETER_H
 #define TEST_INTEROP_CXX_TEMPLATES_INPUTS_TEMPLATE_TEMPLATE_PARAMETER_H
 
-template<template <class> class V>
-struct Asdf {
-  V<IntWrapper> i;
-};
-
 struct IntWrapper {
   int value;
   int getValue() const { return value; }
 };
 
-template <class T>
+template<class T>
 struct MagicWrapper {
   T t;
   int getValuePlusArg(int arg) const { return t.getValue() + arg; }
 };
 
-typedef Asdf<MagicWrapper> Hohoho;
+template<template <class> class V>
+struct TemplatedMagicWrapper {
+  V<IntWrapper> i;
+  int getValuePlusTwiceTheArg(int arg) const { return i.getValuePlusArg(arg) + arg; }
+};
+
+typedef TemplatedMagicWrapper<MagicWrapper> TemplatedWrappedMagicInt;
+typedef MagicWrapper<IntWrapper> WrappedMagicInt;
 #endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_TEMPLATE_TEMPLATE_PARAMETER_H

test/Interop/Cxx/templates/template-template-parameter.swift

@@ -2,15 +2,16 @@
 //
 // REQUIRES: executable_test
 
-import NonTypeParameter
+import TemplateTemplateParameter
 import StdlibUnittest
 
 var TemplatesTestSuite = TestSuite("TemplatesTestSuite")
 
 TemplatesTestSuite.test("variadic-class-template") {
-  let a = IntWrapper(value: 42)
-  let hohoho = Hohoho()
-  hohoho.i = a
+  let myInt = IntWrapper(value: 42)
+  var magicInt = WrappedMagicInt(t: myInt)
+  var templatedWrappedMagicInt = TemplatedWrappedMagicInt(i: magicInt)
+  expectEqual(templatedWrappedMagicInt.getValuePlusTwiceTheArg(10), 62)
 }
 
-runAllTests()
+runAllTests()