Menu
▾
▴
[Andromdaplugins-cvs] CVS update: cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring IServiceOne.cs IServiceTwoNoStubs.cs ServiceOneBase.cs ServiceOneImpl.cs ServiceTwoNoStubsBase.cs ServiceTwoNoStubsImpl.cs
User: cmicali
Date: 06/10/18 11:43:29
Modified: andromda-cs/src/test/expected cartridge-output.zip
andromda-cs/src/test/expected/org/andromda/cartridges/csharp
TestEnumeration.cs TestIntEnumeration.cs
TestStringEnumeration.cs TestSubInterface1.cs
TestSubInterface2.cs TestSubInterface3.cs
TestSuperInterface1.cs TestSuperInterface2.cs
andromda-nhibernate/src/test/expected cartridge-output.zip
andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate
EntityOne.cs EntityOne.hbm.xml EntityTwo.cs
EntityTwo.hbm.xml EntityTwoImpl.cs
andromda-nspring/src/test/expected cartridge-output.zip
andromda-nspring/src/test/expected/org/andromda/cartridges/nspring
IServiceOne.cs IServiceTwoNoStubs.cs
ServiceOneBase.cs ServiceOneImpl.cs
ServiceTwoNoStubsBase.cs ServiceTwoNoStubsImpl.cs
Log:
- Fixed breaking tests
Revision Changes Path
1.5 +20 -27 cartridges/andromda-cs/src/test/expected/cartridge-output.zip
<<Binary file>>
1.3 +2 -1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestEnumeration.cs
Index: TestEnumeration.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestEnumeration.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TestEnumeration.cs 15 Aug 2006 22:48:44 -0000 1.2
+++ TestEnumeration.cs 18 Oct 2006 18:43:19 -0000 1.3
@@ -20,5 +20,6 @@
TEST1 = 0,
TEST2 = 1203212
// Enumeration.vsl merge-point
+
}
}
1.2 +2 -1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestIntEnumeration.cs
Index: TestIntEnumeration.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestIntEnumeration.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestIntEnumeration.cs 22 Jun 2006 20:28:27 -0000 1.1
+++ TestIntEnumeration.cs 18 Oct 2006 18:43:22 -0000 1.2
@@ -20,5 +20,6 @@
ATTRIBUTE_ONE = 12,
ATTRIBUTE_TWO = 14
// Enumeration.vsl merge-point
+
}
}
1.2 +2 -1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestStringEnumeration.cs
Index: TestStringEnumeration.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestStringEnumeration.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestStringEnumeration.cs 15 Aug 2006 22:48:44 -0000 1.1
+++ TestStringEnumeration.cs 18 Oct 2006 18:43:22 -0000 1.2
@@ -20,5 +20,6 @@
Test1,
Test2
// Enumeration.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface1.cs
Index: TestSubInterface1.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface1.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSubInterface1.cs 15 Aug 2006 22:48:44 -0000 1.1
+++ TestSubInterface1.cs 18 Oct 2006 18:43:22 -0000 1.2
@@ -22,5 +22,8 @@
// ----- Accessors -----
// ----- Operations -----
+
+ // Interface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface2.cs
Index: TestSubInterface2.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface2.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSubInterface2.cs 15 Aug 2006 22:48:45 -0000 1.1
+++ TestSubInterface2.cs 18 Oct 2006 18:43:22 -0000 1.2
@@ -22,5 +22,8 @@
// ----- Accessors -----
// ----- Operations -----
+
+ // Interface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface3.cs
Index: TestSubInterface3.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface3.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSubInterface3.cs 15 Aug 2006 22:48:45 -0000 1.1
+++ TestSubInterface3.cs 18 Oct 2006 18:43:24 -0000 1.2
@@ -27,5 +27,8 @@
/// </summary>
org.andromda.cartridges.csharp.TestSuperInterface2 operation31(float xx);
+
+ // Interface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface1.cs
Index: TestSuperInterface1.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface1.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSuperInterface1.cs 15 Aug 2006 22:48:45 -0000 1.1
+++ TestSuperInterface1.cs 18 Oct 2006 18:43:24 -0000 1.2
@@ -57,5 +57,8 @@
/// </summary>
void operation1(int i);
+
+ // Interface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface2.cs
Index: TestSuperInterface2.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface2.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestSuperInterface2.cs 15 Aug 2006 22:48:45 -0000 1.1
+++ TestSuperInterface2.cs 18 Oct 2006 18:43:24 -0000 1.2
@@ -21,5 +21,8 @@
// ----- Accessors -----
// ----- Operations -----
+
+ // Interface.vsl merge-point
+
}
}
1.7 +24 -23 cartridges/andromda-nhibernate/src/test/expected/cartridge-output.zip
<<Binary file>>
1.6 +2 -2 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.cs
Index: EntityOne.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EntityOne.cs 2 Oct 2006 01:21:47 -0000 1.5
+++ EntityOne.cs 18 Oct 2006 18:43:26 -0000 1.6
@@ -2,7 +2,7 @@
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEntity.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEntity.vsl in andromda-nhibernate-cartridge.
using System;
@@ -167,7 +167,7 @@
#endregion
- // HibernateEntity.vsl merge-point
+ // NHibernateEntity.vsl merge-point
}
}
1.3 +1 -1 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.hbm.xml
Index: EntityOne.hbm.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EntityOne.hbm.xml 17 Aug 2006 20:28:34 -0000 1.2
+++ EntityOne.hbm.xml 18 Oct 2006 18:43:26 -0000 1.3
@@ -45,5 +45,5 @@
</set>
</class>
-
+ <!-- NHibernate.hbm.xml.vsl merge-point -->
</hibernate-mapping>
\ No newline at end of file
1.6 +2 -2 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.cs
Index: EntityTwo.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EntityTwo.cs 2 Oct 2006 01:21:47 -0000 1.5
+++ EntityTwo.cs 18 Oct 2006 18:43:26 -0000 1.6
@@ -2,7 +2,7 @@
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEntity.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEntity.vsl in andromda-nhibernate-cartridge.
using System;
@@ -140,7 +140,7 @@
#endregion
- // HibernateEntity.vsl merge-point
+ // NHibernateEntity.vsl merge-point
}
}
1.3 +1 -1 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.hbm.xml
Index: EntityTwo.hbm.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EntityTwo.hbm.xml 17 Aug 2006 20:28:34 -0000 1.2
+++ EntityTwo.hbm.xml 18 Oct 2006 18:43:27 -0000 1.3
@@ -34,5 +34,5 @@
</many-to-one>
</class>
-
+ <!-- NHibernate.hbm.xml.vsl merge-point -->
</hibernate-mapping>
\ No newline at end of file
1.2 +2 -1 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwoImpl.cs
Index: EntityTwoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwoImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EntityTwoImpl.cs 15 Aug 2006 22:48:48 -0000 1.1
+++ EntityTwoImpl.cs 18 Oct 2006 18:43:27 -0000 1.2
@@ -2,7 +2,7 @@
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
-// Generated by: HibernateEntityImpl.vsl in andromda-nhibernate-cartridge.
+// Generated by: NHibernateEntityImpl.vsl in andromda-nhibernate-cartridge.
using System;
@@ -15,5 +15,6 @@
public class EntityTwoImpl
: org.andromda.cartridges.nhibernate.EntityTwo
{
+ // NHibernateEntityImpl.vsl merge-point
}
}
1.4 +41 -17 cartridges/andromda-nspring/src/test/expected/cartridge-output.zip
<<Binary file>>
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/IServiceOne.cs
Index: IServiceOne.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/IServiceOne.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- IServiceOne.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ IServiceOne.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -23,5 +23,8 @@
/// </summary>
datatype::long doSomethingElse(datatype::String param);
+
+ // NSpringServiceInterface.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/IServiceTwoNoStubs.cs
Index: IServiceTwoNoStubs.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/IServiceTwoNoStubs.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- IServiceTwoNoStubs.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ IServiceTwoNoStubs.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -23,5 +23,8 @@
/// </summary>
datatype::long doSomethingElse(datatype::String param);
+
+ // NSpringServiceInterface.vsl merge-point
+
}
}
1.3 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneBase.cs
Index: ServiceOneBase.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneBase.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ServiceOneBase.cs 2 Oct 2006 02:04:23 -0000 1.2
+++ ServiceOneBase.cs 18 Oct 2006 18:43:28 -0000 1.3
@@ -84,5 +84,8 @@
/// <summary>
protected abstract datatype::long HandleDoSomethingElse(datatype::String param);
+
+ // NSpringServiceBase.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneImpl.cs
Index: ServiceOneImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ServiceOneImpl.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ ServiceOneImpl.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -35,5 +35,8 @@
return null;
}
+
+ // NSpringServiceImpl.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsBase.cs
Index: ServiceTwoNoStubsBase.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsBase.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ServiceTwoNoStubsBase.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ ServiceTwoNoStubsBase.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -48,5 +48,8 @@
/// <summary>
protected abstract datatype::long HandleDoSomethingElse(datatype::String param);
+
+ // NSpringServiceBase.vsl merge-point
+
}
}
1.2 +3 -0 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsImpl.cs
Index: ServiceTwoNoStubsImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsImpl.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ServiceTwoNoStubsImpl.cs 15 Aug 2006 22:48:49 -0000 1.1
+++ ServiceTwoNoStubsImpl.cs 18 Oct 2006 18:43:28 -0000 1.2
@@ -35,5 +35,8 @@
return null;
}
+
+ // NSpringServiceImpl.vsl merge-point
+
}
}
|
