applied_patches/0332-mono-testtools.diff

   1 --- testtools/source/bridgetest/cli/makefile.mk.old     2009-04-02 11:05:37.000000000 +0000
   2 +++ testtools/source/bridgetest/cli/makefile.mk 2009-04-06 16:41:58.000000000 +0000
   3 @@ -50,28 +50,25 @@ DLLPRE =
   4  CFLAGSENABLESYMBOLS:=-Z7
   5  # ------------------------------------------------------------------
   6
   7 -#These tests are for Windows only
   8 -.IF "$(COM)" == "MSC" && "$(GUI)" == "WNT"
   9 -
  10 -.IF "$(CCNUMVER)" >= "001399999999"
  11 -CFLAGSCXX += -clr:oldSyntax -AI $(OUT)$/bin -AI $(SOLARBINDIR)
  12 -SHL1STDLIBS = \
  13 -       mscoree.lib \
  14 -       msvcmrt.lib
  15 -.ELSE
  16 -CFLAGSCXX += -clr -AI $(OUT)$/bin -AI $(SOLARBINDIR)
  17 -SHL1STDLIBS = \
  18 -       mscoree.lib
  19 -.ENDIF
  20 -SLOFILES= \
  21 +#.IF "$(CCNUMVER)" >= "001399999999"
  22 +#CFLAGSCXX += -clr:oldSyntax -AI $(OUT)$/bin -AI $(SOLARBINDIR)
  23 +#SHL1STDLIBS = \
  24 +#      mscoree.lib \
  25 +#      msvcmrt.lib
  26 +#.ELSE
  27 +#CFLAGSCXX += -clr -AI $(OUT)$/bin -AI $(SOLARBINDIR)
  28 +#SHL1STDLIBS = \
  29 +#      mscoree.lib
  30 +#.ENDIF
  31 +#SLOFILES= \
  32         $(SLO)$/cli_cpp_bridgetest.obj
  33
  34 -SHL1OBJS = $(SLOFILES)
  35 +#SHL1OBJS = $(SLOFILES)
  36
  37 -SHL1TARGET = $(TARGET)
  38 +#SHL1TARGET = $(TARGET)
  39
  40 -SHL1DEF = $(MISC)$/$(SHL1TARGET).def
  41 -DEF1NAME = $(SHL1TARGET)
  42 +#SHL1DEF = $(MISC)$/$(SHL1TARGET).def
  43 +#DEF1NAME = $(SHL1TARGET)
  44
  45  .ENDIF
  46
  47 @@ -92,7 +89,7 @@ CLI_CPPUHELPER = $(SOLARBINDIR)$/cli_cpp
  48  CLI_OOOTYPES = $(SOLARBINDIR)$/cli_oootypes.dll
  49  CLI_TYPES_BRIDGETEST = $(BIN)$/cli_types_bridgetest.dll
  50
  51 -CSCFLAGS = -warnaserror+
  52 +CSCFLAGS =
  53  .IF "$(CCNUMVER)" <= "001399999999"
  54  VBC_FLAGS = -warnaserror+
  55  .ELSE
  56 @@ -149,8 +146,7 @@ $(BIN)$/cli_vb_bridgetest.uno.dll : \
  57                 -reference:$(CLI_TYPES_BRIDGETEST) \
  58                 -reference:System.dll \
  59                 -reference:System.Drawing.dll \
  60 -               -reference:System.Windows.Forms.dll \
  61 -               cli_vb_bridgetest.vb
  62 +               -reference:System.Windows.Forms.dll
  63
  64  $(BIN)$/cli_vb_testobj.uno.dll : \
  65                 cli_vb_testobj.vb \
  66 @@ -181,9 +177,6 @@ $(BIN)$/cli_bridgetest_inprocess.exe : \
  67                 cli_bridgetest_inprocess.cs \
  68                 $(BIN)$/cli_cs_bridgetest.uno.dll \
  69                 $(BIN)$/cli_cs_testobj.uno.dll \
  70 -               $(BIN)$/cli_vb_bridgetest.uno.dll \
  71 -               $(BIN)$/cli_vb_testobj.uno.dll \
  72 -               $(BIN)$/cli_cpp_bridgetest.uno.dll \
  73                 $(MISC)$/copyassemblies.done \
  74                 $(CLI_BASETYPES) \
  75                 $(CLI_URETYPES) \
  76 @@ -197,11 +190,7 @@ $(BIN)$/cli_bridgetest_inprocess.exe : \
  77                 -reference:$(CLI_CPPUHELPER) \
  78                 -reference:$(BIN)$/cli_cs_bridgetest.uno.dll \
  79                 -reference:$(BIN)$/cli_cs_testobj.uno.dll \
  80 -               -reference:$(BIN)$/cli_vb_bridgetest.uno.dll \
  81 -               -reference:$(BIN)$/cli_vb_testobj.uno.dll \
  82 -               -reference:$(BIN)$/cli_cpp_bridgetest.uno.dll \
  83                 cli_bridgetest_inprocess.cs
  84         $(GNUCOPY) cli_bridgetest_inprocess.ini $(BIN)
  85
  86 -.ENDIF
  87
  88 --- testtools/source/bridgetest/idl/makefile.mk.old     2009-04-02 11:05:37.000000000 +0000
  89 +++ testtools/source/bridgetest/idl/makefile.mk 2009-04-06 16:41:58.000000000 +0000
  90 @@ -51,8 +51,6 @@ $(BIN)$/bridgetest.rdb: bridgetest.idl
  91      - $(RM) $@
  92      $(REGMERGE) $@ /UCR $(MISC)$/$(TARGET)$/bridgetest.urd
  93
  94 -.IF "$(GUI)" == "WNT"
  95 -.IF "$(COM)" != "GCC"
  96
  97  CLIMAKERFLAGS =
  98  .IF "$(debug)" != ""
  99 @@ -68,5 +66,3 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN)
 100                 -X $(SOLARBINDIR)$/types.rdb $<
 101      $(TOUCH) $@
 102
 103 -.ENDIF
 104 -.ENDIF # GUI, WNT
 105 --- testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs.old     2009-04-02 11:05:37.000000000 +0000
 106 +++ testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs 2009-04-06 16:41:58.000000000 +0000
 107 @@ -130,26 +130,14 @@ public class BridgeTest
 108                      new uno.Any(
 109                          typeof (XSingleComponentFactory),
 110                          new Factory(
 111 -                            typeof (vb_testobj.VBBridgeTestObject),
 112 -                            "com.sun.star.test.bridge.cli_uno.VbTestObject" ) ) );
 113 -                xSet.insert(
 114 -                    new uno.Any(
 115 -                        typeof (XSingleComponentFactory),
 116 -                        new Factory(
 117 -                            typeof (cpp_bridgetest.BridgeTest),
 118 -                            "com.sun.star.test.bridge.cli_uno.CppBridgeTest" ) ) );
 119 -                xSet.insert(
 120 -                    new uno.Any(
 121 -                        typeof (XSingleComponentFactory),
 122 -                        new Factory(
 123                              typeof (cs_testobj.BridgeTest),
 124                              "com.sun.star.test.bridge.cli_uno.CsBridgeTest" ) ) );
 125 -                xSet.insert(
 126 -                    new uno.Any(
 127 -                        typeof (XSingleComponentFactory),
 128 -                        new Factory(
 129 -                            typeof (vb_bridetest.BridgeTest),
 130 -                            "com.sun.star.test.bridge.cli_uno.VbBridgeTest" ) ) );
 131 +
 132 +/*             {
 133 +                       Console.WriteLine(
 134 +                           "\n[cli bridgetest] C# client calls C# object [hack]");
 135 +                       cs_testobj.BridgeTest.perform_test (new cs_testobj.BridgeTestObject( xContext ));
 136 +               } */
 137
 138                  // I.
 139                  // direct unbridged test
 140 @@ -205,7 +193,7 @@ public class BridgeTest
 141                  //     -s com.sun.star.test.bridge.cli_uno.VbBridgeTest
 142                  //     -- com.sun.star.test.bridge.CppTestObject
 143                  // get CLI client
 144 -                test_client =
 145 +/*                test_client =
 146                      xContext.getServiceManager().createInstanceWithContext(
 147                          "com.sun.star.test.bridge.cli_uno.VbBridgeTest",
 148                          xContext );
 149 @@ -214,7 +202,7 @@ public class BridgeTest
 150                      "\n[cli bridgetest] 4. Visual Basic client calls C++ (native) object" );
 151                  // run with native target object
 152                  xClient.run(
 153 -                    new String [] { "com.sun.star.test.bridge.CppTestObject" } );
 154 +                    new String [] { "com.sun.star.test.bridge.CppTestObject" } ); */
 155
 156                  // V:
 157                  // uno -ro uno_services.rdb -ro uno_types.rdb
 158 @@ -237,7 +225,7 @@ public class BridgeTest
 159                  // uno -ro uno_services.rdb -ro uno_types.rdb
 160                  // -s com.sun.star.test.bridge.cli_uno.CppBridgeTest
 161                  // -- com.sun.star.test.bridge.CppTestObject
 162 -                test_client =
 163 +/*                test_client =
 164                      xContext.getServiceManager().createInstanceWithContext(
 165                          "com.sun.star.test.bridge.cli_uno.CppBridgeTest",
 166                          xContext );
 167 @@ -246,7 +234,7 @@ public class BridgeTest
 168                      "\n[cli bridgetest] 6. CLI C++ client calls C++ object (native)");
 169                  // run with native target object
 170                  xClient.run(
 171 -                    new String [] { "com.sun.star.test.bridge.CppTestObject" } );
 172 +                    new String [] { "com.sun.star.test.bridge.CppTestObject" } );*/
 173              }
 174          }
 175          catch (System.Exception exc)
 176 --- testtools/source/bridgetest/cli/cli_bridgetest_inprocess.ini.old    2009-04-02 11:05:37.000000000 +0000
 177 +++ testtools/source/bridgetest/cli/cli_bridgetest_inprocess.ini        2009-04-06 16:41:58.000000000 +0000
 178 @@ -1,3 +1,3 @@
 179  [Bootstrap]
 180 -UNO_TYPES=$SYSBINDIR/uno_types.rdb
 181 -UNO_SERVICES=$SYSBINDIR/uno_services.rdb
 182 +UNO_TYPES=uno_types.rdb
 183 +UNO_SERVICES=uno_services.rdb