Merge branch 'feature/upstream' into develop

3 files changed, 0 insertions, 280 deletions

diff --git a/xsd/tests/cxx/tree/naming/camel/driver.cxx b/xsd/tests/cxx/tree/naming/camel/driver.cxx
deleted file mode 100644
index 716a544..0000000
--- a/xsd/tests/cxx/tree/naming/camel/driver.cxx
+++ /dev/null
@@ -1,155 +0,0 @@
-// file      : tests/cxx/tree/naming/camel/driver.cxx
-// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
-// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test camel case (upper for types, lower for functions) naming style.
-//
-
-#include <sstream>
-#include <iostream>
-
-#include <xercesc/util/PlatformUtils.hpp>
-
-#include "test.hxx"
-
-using namespace std;
-using namespace test;
-
-int
-main ()
-{
-  xercesc::XMLPlatformUtils::Initialize ();
-
-  try
-  {
-    // Enum 'value' type.
-    //
-    {
-      Gender::Value v;
-      v = Gender::female;
-      XSD_UNUSED (v);
-    }
-
-    // Anonymous type.
-    //
-    {
-      Foo f ("a", "b");
-
-      if (f.a () != "a" || f.b () != "b")
-        return 1;
-    }
-
-    // Type name and accessors/modifiers.
-    //
-    {
-      Type t ("bar");
-
-      // foo
-      //
-      {
-        Type::FooType* p = 0;
-        XSD_UNUSED (p);
-
-        Type::FooOptional o;
-
-        if (t.foo ().present ())
-          return 1;
-
-        t.foo (o);
-      }
-
-      // bar
-      //
-      {
-        Type::BarType* p = 0;
-        XSD_UNUSED (p);
-
-        if (t.bar () != "bar")
-          return 1;
-
-        t.bar ("barbar");
-      }
-
-      // baz
-      //
-      {
-        Type::BazType* p = 0;
-        XSD_UNUSED (p);
-
-        Type::BazSequence s;
-        Type::BazIterator i (s.begin ());
-        Type::BazConstIterator ci (s.begin ());
-        XSD_UNUSED (i);
-        XSD_UNUSED (ci);
-
-        if (t.baz () != s)
-          return 1;
-
-        t.baz (s);
-      }
-
-      // any
-      //
-      {
-        Type::AnySequence s (t.domDocument ());
-        Type::AnyIterator i (s.begin ());
-        Type::AnyConstIterator  ci (s.begin ());
-        XSD_UNUSED (i);
-        XSD_UNUSED (ci);
-
-        if (t.any () != s)
-          return 1;
-
-        t.any (s);
-      }
-
-      // foo
-      //
-      {
-        Type::FoxType x = Type::foxDefaultValue ();
-
-        if (t.fox () != x)
-          return 1;
-
-        t.fox ("fox");
-      }
-
-      // any_attribute
-      //
-      {
-        Type::AnyAttributeSet s (t.domDocument ());
-        Type::AnyAttributeIterator i (s.begin ());
-        Type::AnyAttributeConstIterator ci (s.begin ());
-        XSD_UNUSED (i);
-        XSD_UNUSED (ci);
-
-        if (t.anyAttribute () != s)
-          return 1;
-
-        t.anyAttribute (s);
-      }
-    }
-
-    // Parsing/serialization functions.
-    //
-    {
-      istringstream is ("<t:Root xmlns:t='test'>foo</t:Root>");
-      root (is, xml_schema::Flags::dont_validate);
-    }
-
-    {
-      ostringstream os;
-      xml_schema::NamespaceInfomap m;
-      m["t"].name = "test";
-
-      root (os, "foo", m);
-    }
-  }
-  catch (xml_schema::Exception const& e)
-  {
-    cerr << e << endl;
-    return 1;
-  }
-
-  xercesc::XMLPlatformUtils::Terminate ();
-}
diff --git a/xsd/tests/cxx/tree/naming/camel/makefile b/xsd/tests/cxx/tree/naming/camel/makefile
deleted file mode 100644
index 6364196..0000000
--- a/xsd/tests/cxx/tree/naming/camel/makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-# file      : tests/cxx/tree/naming/camel/makefile
-# copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
-# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o))
-dep := $(obj:.o=.o.d)
-
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
-
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/libxerces-c/stub.make,\
-  l: xerces_c.l,cpp-options: xerces_c.l.cpp-options)
-
-
-# Build.
-#
-$(driver): $(obj) $(xerces_c.l)
-
-$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd
-$(obj) $(dep): $(xerces_c.l.cpp-options)
-
-genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
-gen  := $(addprefix $(out_base)/,$(genf))
-
-$(gen): xsd := $(out_root)/xsd/xsd
-
-$(gen): xsd_options += \
---type-naming ucc \
---function-naming lcc \
---generate-ostream \
---generate-serialization \
---generate-comparison \
---generate-wildcard
-
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-$(test): driver := $(driver)
-$(test): $(driver)
-	$(call message,test $$1,$$1,$(driver))
-
-# Clean.
-#
-$(clean): $(driver).o.clean                                \
-  $(addsuffix .cxx.clean,$(obj))                           \
-  $(addsuffix .cxx.clean,$(dep))                           \
-  $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(gen): | $(out_base)/.gitignore
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/cxx/o-e.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/cxx-d.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): xsd_options += --std $(cxx_standard)
-$(call include,$(scf_root)/xsd/tree/xsd-cxx.make)
-endif
-
-
-# Dependencies.
-#
-$(call import,$(src_root)/xsd/makefile)
diff --git a/xsd/tests/cxx/tree/naming/camel/test.xsd b/xsd/tests/cxx/tree/naming/camel/test.xsd
deleted file mode 100644
index 7d0a745..0000000
--- a/xsd/tests/cxx/tree/naming/camel/test.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-  <simpleType name="gender">
-    <restriction base="string">
-      <enumeration value="male"/>
-      <enumeration value="female"/>
-    </restriction>
-  </simpleType>
-
-  <complexType name="type">
-    <sequence>
-      <element name="foo" minOccurs="0">
-        <complexType>
-          <sequence>
-            <element name="a" type="string"/>
-            <element name="b" type="string"/>
-          </sequence>
-        </complexType>
-      </element>
-      <element name="Bar" type="string"/>
-      <element name="Baz" type="string" maxOccurs="unbounded"/>
-      <any namespace="other" processContents="skip" maxOccurs="unbounded"/>
-    </sequence>
-    <attribute name="Fox" type="string" default="hello"/>
-    <anyAttribute namespace="##other" processContents="skip"/>
-  </complexType>
-
-  <element name="Root" type="string"/>
-
-</schema>