Browse Source

Code cleanup.

git-svn-id: https://mono-soc-2010.googlecode.com/svn/trunk/cppinterop@47 a470b8cb-0e6f-1642-1b45-71e107334c4b
pull/1/head
alexander.corrado 15 years ago
parent
commit
6b1f46c417
  1. 6
      CPPInterop.sln
  2. 10
      CPPTestLib/NUnit.cpp
  3. 14
      CPPTestLib/NUnit.h
  4. 8
      CPPTestLib/VirtualMethodTestClass.cpp
  5. 2
      Mono.VisualC.Interop/Interfaces.cs
  6. 9
      Tests/SharedAbiTests.cs
  7. 9
      Tests/Support/CppNUnitAsserts.cs

6
CPPInterop.sln

@ -7,8 +7,6 @@ Project("{2857B73E-F847-4B02-9238-064979017E93}") = "CPPTestLib", "CPPTestLib\CP @@ -7,8 +7,6 @@ Project("{2857B73E-F847-4B02-9238-064979017E93}") = "CPPTestLib", "CPPTestLib\CP
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{3C290CBE-CA39-47F6-B3A0-ACD16C5A38C8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestDebugHarness", "TestDebugHarness\TestDebugHarness.csproj", "{AD562CD3-5DEB-4D19-9819-5279C0649AE8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -23,10 +21,6 @@ Global @@ -23,10 +21,6 @@ Global
{4A864586-93C5-4DC1-8A80-F094A88506D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A864586-93C5-4DC1-8A80-F094A88506D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A864586-93C5-4DC1-8A80-F094A88506D7}.Release|Any CPU.Build.0 = Release|Any CPU
{AD562CD3-5DEB-4D19-9819-5279C0649AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AD562CD3-5DEB-4D19-9819-5279C0649AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD562CD3-5DEB-4D19-9819-5279C0649AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD562CD3-5DEB-4D19-9819-5279C0649AE8}.Release|Any CPU.Build.0 = Release|Any CPU
{B01E6282-144E-481A-8E1F-95F708DFBC2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B01E6282-144E-481A-8E1F-95F708DFBC2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B01E6282-144E-481A-8E1F-95F708DFBC2D}.Release|Any CPU.ActiveCfg = Release|Any CPU

10
CPPTestLib/NUnit.cpp

@ -1,5 +1,13 @@ @@ -1,5 +1,13 @@
//
// NUnit.cpp: Bridges the NUnit Assert methods to C++
//
// Author:
// Alexander Corrado (alexander.corrado@gmail.com)
//
// Copyright (C) 2010 Alexander Corrado
//
#include "TestFramework.h"
#include "NUnit.h"
NUnit* NUnit::Assert;

14
CPPTestLib/NUnit.h

@ -1,6 +1,14 @@ @@ -1,6 +1,14 @@
//
// NUnit.h: The NUnit C++ interface
//
// Author:
// Alexander Corrado (alexander.corrado@gmail.com)
//
// Copyright (C) 2010 Alexander Corrado
//
#ifndef _CPPINTEROP_TESTFRAMEWORK_H_
#define _CPPINTEROP_TESTFRAMEWORK_H_
#ifndef _CPPINTEROP_NUNIT_H_
#define _CPPINTEROP_NUNIT_H_
#ifdef __GNUC__
#define EXPORT
@ -103,4 +111,4 @@ class NUnit { @@ -103,4 +111,4 @@ class NUnit {
};
#endif /* _CPPINTEROP_TESTFRAMEWORK_H_ */
#endif /* _CPPINTEROP_NUNIT_H_ */

8
CPPTestLib/VirtualMethodTestClass.cpp

@ -1,3 +1,11 @@ @@ -1,3 +1,11 @@
//
// VirtualMethodTestClass.cpp: A test C++ class used to exercise vtable behavior in CppInterop
//
// Author:
// Alexander Corrado (alexander.corrado@gmail.com)
//
// Copyright (C) 2010 Alexander Corrado
//
#include "NUnit.h"

2
Mono.VisualC.Interop/Interfaces.cs

@ -19,6 +19,8 @@ namespace Mono.VisualC.Interop { @@ -19,6 +19,8 @@ namespace Mono.VisualC.Interop {
VTable ClassVTable { get; }
}
// This should go without saying, but the C++ class must have a constructor
// if it is to be instantiatable.
public interface ICppClassInstantiatable : ICppClass {
CppInstancePtr Alloc ();
void Destruct (CppInstancePtr instance);

9
Tests/SharedAbiTests.cs

@ -1,3 +1,12 @@ @@ -1,3 +1,12 @@
//
// SharedAbiTests.cs: Test cases that are shared by all ABIs
//
// Author:
// Alexander Corrado (alexander.corrado@gmail.com)
//
// Copyright (C) 2010 Alexander Corrado
//
using System;
using NUnit.Framework;

9
Tests/Support/CppNUnitAsserts.cs

@ -1,3 +1,12 @@ @@ -1,3 +1,12 @@
//
// CppNUnitAsserts.cs: Exposes NUnit Assert methods to C++
//
// Author:
// Alexander Corrado (alexander.corrado@gmail.com)
//
// Copyright (C) 2010 Alexander Corrado
//
using System;
using System.Runtime.InteropServices;
using NUnit.Framework;

Loading…
Cancel
Save