From ca08bd5aba5e69fce3b0f5b4f861ffec9fe4d2e5 Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Sun, 8 Feb 2015 12:53:39 -0700
Subject: OPEN-292 - Remove lscript from project, Remove legacy udp script
upload methods, Refactor script runtime perms from three arrays to one struct
array so we don't have to juggle array order anymore.
---
indra/test/CMakeLists.txt | 2 -
indra/test/llscriptresource_tut.cpp | 198 ------------------------------------
2 files changed, 200 deletions(-)
delete mode 100755 indra/test/llscriptresource_tut.cpp
(limited to 'indra/test')
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 01d1d830a2..9404dcf88e 100755
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -9,7 +9,6 @@ include(LLMath)
include(LLMessage)
include(LLVFS)
include(LLXML)
-include(LScript)
include(Linking)
include(Tut)
include(LLAddBuildTest)
@@ -47,7 +46,6 @@ set(test_SOURCE_FILES
llpermissions_tut.cpp
llpipeutil.cpp
llsaleinfo_tut.cpp
- llscriptresource_tut.cpp
llsdmessagebuilder_tut.cpp
llsdmessagereader_tut.cpp
llsd_new_tut.cpp
diff --git a/indra/test/llscriptresource_tut.cpp b/indra/test/llscriptresource_tut.cpp
deleted file mode 100755
index 7a3b824e6d..0000000000
--- a/indra/test/llscriptresource_tut.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * @file llscriptresource_tut.cpp
- * @brief Test LLScriptResource
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-//#include <tut/tut.h>
-#include "linden_common.h"
-
-#include "lltut.h"
-
-#include "llscriptresource.h"
-#include "llscriptresourceconsumer.h"
-#include "llscriptresourcepool.h"
-
-class TestConsumer : public LLScriptResourceConsumer
-{
-public:
- TestConsumer()
- : mUsedURLs(0)
- { }
-
- // LLScriptResourceConsumer interface:
- S32 getUsedPublicURLs() const
- {
- return mUsedURLs;
- }
-
- // Test details:
- S32 mUsedURLs;
-};
-
-
-namespace tut
-{
- class LLScriptResourceTestData
- {
- };
-
- typedef test_group<LLScriptResourceTestData> LLScriptResourceTestGroup;
- typedef LLScriptResourceTestGroup::object LLScriptResourceTestObject;
- LLScriptResourceTestGroup scriptResourceTestGroup("scriptResource");
-
- template<> template<>
- void LLScriptResourceTestObject::test<1>()
- {
- LLScriptResource resource;
- U32 total = 42;
-
- resource.setTotal(total);
- ensure_equals("Verify set/get total", resource.getTotal(), total);
- ensure_equals("Verify all resources are initially available",resource.getAvailable(),total);
-
- // Requesting too many, releasing non-allocated
- ensure("Request total + 1 resources should fail",!resource.request(total + 1));
- ensure_equals("Verify all resources available after failed request",resource.getAvailable(),total);
-
- ensure("Releasing resources when none allocated should fail",!resource.release());
- ensure_equals("All resources should be available after failed release",resource.getAvailable(),total);
-
- ensure("Request one resource", resource.request());
- ensure_equals("Verify available resources after successful request",resource.getAvailable(),total - 1);
-
- // Is this right? Or should we release all used resources if we try to release more than are currently used?
- ensure("Release more resources than allocated",!resource.release(2));
- ensure_equals("Verify resource availability after failed release",resource.getAvailable(),total - 1);
-
- ensure("Release a resource",resource.release());
- ensure_equals("Verify all resources available after successful release",resource.getAvailable(),total);
- }
-
-
- template<> template<>
- void LLScriptResourceTestObject::test<2>()
- {
- LLScriptResource resource;
- U32 total = 42;
-
- resource.setTotal(total);
-
- S32 resources_to_request = 30;
- ensure("Get multiple resources resources",resource.request(resources_to_request));
- ensure_equals("Verify available resources is correct after request of multiple resources",resource.getAvailable(), total - resources_to_request);
-
- S32 resources_to_release = (resources_to_request / 2);
- ensure("Release some resources",resource.release(resources_to_release));
-
- S32 expected_available = (total - resources_to_request + resources_to_release);
- ensure_equals("Verify available resources after release of some resources",resource.getAvailable(), expected_available);
-
- resources_to_release = (resources_to_request - resources_to_release);
- ensure("Release remaining resources",resource.release(resources_to_release));
-
- ensure_equals("Verify available resources after release of remaining resources",resource.getAvailable(), total);
- }
-
- template<> template<>
- void LLScriptResourceTestObject::test<3>()
- {
- LLScriptResource resource;
-
- U32 total = 42;
- resource.setTotal(total);
-
- ensure("Request all resources",resource.request(total));
-
- U32 low_total = 10;
- ensure("Release all resources",resource.release(total));
- ensure_equals("Verify all resources available after releasing",resource.getAvailable(),total);
-
- resource.setTotal(low_total);
- ensure_equals("Verify low total resources are available after set",resource.getAvailable(),low_total);
- }
-
-
- template<> template<>
- void LLScriptResourceTestObject::test<4>()
- {
- S32 big_resource_total = 100;
- S32 small_resource_total = 10;
- LLScriptResourcePool big_pool;
- big_pool.getPublicURLResource().setTotal(big_resource_total);
- LLScriptResourcePool small_pool;
- small_pool.getPublicURLResource().setTotal(small_resource_total);
-
- TestConsumer consumer;
- LLScriptResourcePool& initial_pool = consumer.getScriptResourcePool();
- ensure("Initial resource pool is 'null'.", (&initial_pool == &LLScriptResourcePool::null));
-
- consumer.switchScriptResourcePools(big_pool);
- LLScriptResourcePool& get_pool = consumer.getScriptResourcePool();
- ensure("Get resource that was set.", (&big_pool == &get_pool));
-
- ensure_equals("No public urls in use yet.", consumer.getUsedPublicURLs(),0);
-
- S32 request_urls = 5;
- consumer.mUsedURLs = request_urls;
- consumer.getScriptResourcePool().getPublicURLResource().request(request_urls);
-
- ensure_equals("Available urls on big_pool is 5 less than total.",
- big_pool.getPublicURLResource().getAvailable(), big_resource_total - request_urls);
-
- ensure("Switching from big pool to small pool",
- consumer.switchScriptResourcePools(small_pool));
-
- ensure_equals("All resources available to big pool again",
- big_pool.getPublicURLResource().getAvailable(), big_resource_total);
-
- ensure_equals("Available urls on small pool is 5 less than total.",
- small_pool.getPublicURLResource().getAvailable(), small_resource_total - request_urls);
-
- ensure("Switching from small pool to big pool",
- consumer.switchScriptResourcePools(big_pool));
-
- consumer.getScriptResourcePool().getPublicURLResource().release(request_urls);
-
- request_urls = 50; // Too many for the small_pool
-
- consumer.mUsedURLs = request_urls;
- consumer.getScriptResourcePool().getPublicURLResource().request(request_urls);
-
- // Verify big pool has them
- ensure_equals("Available urls on big pool is 50 less than total.",
- big_pool.getPublicURLResource().getAvailable(), big_resource_total - request_urls);
-
- // Verify can't switch to small_pool
- ensure("Switching to small pool with too many resources",
- !consumer.switchScriptResourcePools(small_pool));
-
- // Verify big pool still accounting for used resources
- ensure_equals("Available urls on big_pool is still 50 less than total.",
- big_pool.getPublicURLResource().getAvailable(), big_resource_total - request_urls);
-
- // Verify small pool still has all resources available.
- ensure_equals("All resources in small pool are still available.",
- small_pool.getPublicURLResource().getAvailable(), small_resource_total);
- }
-}
--
cgit v1.2.3
From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 10 Nov 2015 09:48:56 -0500
Subject: remove execute permission from many files that should not have it
---
indra/test/CMakeLists.txt | 0
indra/test/blowfish.digits.txt | 0
indra/test/catch_and_store_what_in.h | 0
indra/test/debug.h | 0
indra/test/io.cpp | 0
indra/test/llapp_tut.cpp | 0
indra/test/llassetuploadqueue_tut.cpp | 0
indra/test/llblowfish_tut.cpp | 0
indra/test/llbuffer_tut.cpp | 0
indra/test/lldatapacker_tut.cpp | 0
indra/test/lldoubledispatch_tut.cpp | 0
indra/test/llevents_tut.cpp | 0
indra/test/llhttpdate_tut.cpp | 0
indra/test/llhttpnode_tut.cpp | 0
indra/test/lliohttpserver_tut.cpp | 0
indra/test/llmessageconfig_tut.cpp | 0
indra/test/llmessagetemplateparser_tut.cpp | 0
indra/test/llpermissions_tut.cpp | 0
indra/test/llpipeutil.cpp | 0
indra/test/llpipeutil.h | 0
indra/test/llsaleinfo_tut.cpp | 0
indra/test/llscriptresource_tut.cpp | 0
indra/test/llsd_new_tut.cpp | 0
indra/test/llsdmessagebuilder_tut.cpp | 0
indra/test/llsdmessagereader_tut.cpp | 0
indra/test/llsdtraits.h | 0
indra/test/llsdutil_tut.cpp | 0
indra/test/llservicebuilder_tut.cpp | 0
indra/test/llstreamtools_tut.cpp | 0
indra/test/lltemplatemessagebuilder_tut.cpp | 0
indra/test/lltimestampcache_tut.cpp | 0
indra/test/lltranscode_tut.cpp | 0
indra/test/lltut.cpp | 0
indra/test/lltut.h | 0
indra/test/lluserrelations_tut.cpp | 0
indra/test/llxorcipher_tut.cpp | 0
indra/test/message_tut.cpp | 0
indra/test/mock_http_client.cpp | 0
indra/test/mock_http_client.h | 0
indra/test/namedtempfile.h | 0
indra/test/prim_linkability_tut.cpp | 0
indra/test/test.cpp | 0
indra/test/test.h | 0
43 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 indra/test/CMakeLists.txt
mode change 100755 => 100644 indra/test/blowfish.digits.txt
mode change 100755 => 100644 indra/test/catch_and_store_what_in.h
mode change 100755 => 100644 indra/test/debug.h
mode change 100755 => 100644 indra/test/io.cpp
mode change 100755 => 100644 indra/test/llapp_tut.cpp
mode change 100755 => 100644 indra/test/llassetuploadqueue_tut.cpp
mode change 100755 => 100644 indra/test/llblowfish_tut.cpp
mode change 100755 => 100644 indra/test/llbuffer_tut.cpp
mode change 100755 => 100644 indra/test/lldatapacker_tut.cpp
mode change 100755 => 100644 indra/test/lldoubledispatch_tut.cpp
mode change 100755 => 100644 indra/test/llevents_tut.cpp
mode change 100755 => 100644 indra/test/llhttpdate_tut.cpp
mode change 100755 => 100644 indra/test/llhttpnode_tut.cpp
mode change 100755 => 100644 indra/test/lliohttpserver_tut.cpp
mode change 100755 => 100644 indra/test/llmessageconfig_tut.cpp
mode change 100755 => 100644 indra/test/llmessagetemplateparser_tut.cpp
mode change 100755 => 100644 indra/test/llpermissions_tut.cpp
mode change 100755 => 100644 indra/test/llpipeutil.cpp
mode change 100755 => 100644 indra/test/llpipeutil.h
mode change 100755 => 100644 indra/test/llsaleinfo_tut.cpp
mode change 100755 => 100644 indra/test/llscriptresource_tut.cpp
mode change 100755 => 100644 indra/test/llsd_new_tut.cpp
mode change 100755 => 100644 indra/test/llsdmessagebuilder_tut.cpp
mode change 100755 => 100644 indra/test/llsdmessagereader_tut.cpp
mode change 100755 => 100644 indra/test/llsdtraits.h
mode change 100755 => 100644 indra/test/llsdutil_tut.cpp
mode change 100755 => 100644 indra/test/llservicebuilder_tut.cpp
mode change 100755 => 100644 indra/test/llstreamtools_tut.cpp
mode change 100755 => 100644 indra/test/lltemplatemessagebuilder_tut.cpp
mode change 100755 => 100644 indra/test/lltimestampcache_tut.cpp
mode change 100755 => 100644 indra/test/lltranscode_tut.cpp
mode change 100755 => 100644 indra/test/lltut.cpp
mode change 100755 => 100644 indra/test/lltut.h
mode change 100755 => 100644 indra/test/lluserrelations_tut.cpp
mode change 100755 => 100644 indra/test/llxorcipher_tut.cpp
mode change 100755 => 100644 indra/test/message_tut.cpp
mode change 100755 => 100644 indra/test/mock_http_client.cpp
mode change 100755 => 100644 indra/test/mock_http_client.h
mode change 100755 => 100644 indra/test/namedtempfile.h
mode change 100755 => 100644 indra/test/prim_linkability_tut.cpp
mode change 100755 => 100644 indra/test/test.cpp
mode change 100755 => 100644 indra/test/test.h
(limited to 'indra/test')
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/test/blowfish.digits.txt b/indra/test/blowfish.digits.txt
old mode 100755
new mode 100644
diff --git a/indra/test/catch_and_store_what_in.h b/indra/test/catch_and_store_what_in.h
old mode 100755
new mode 100644
diff --git a/indra/test/debug.h b/indra/test/debug.h
old mode 100755
new mode 100644
diff --git a/indra/test/io.cpp b/indra/test/io.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llapp_tut.cpp b/indra/test/llapp_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llassetuploadqueue_tut.cpp b/indra/test/llassetuploadqueue_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lldatapacker_tut.cpp b/indra/test/lldatapacker_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lldoubledispatch_tut.cpp b/indra/test/lldoubledispatch_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llevents_tut.cpp b/indra/test/llevents_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llhttpdate_tut.cpp b/indra/test/llhttpdate_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llhttpnode_tut.cpp b/indra/test/llhttpnode_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lliohttpserver_tut.cpp b/indra/test/lliohttpserver_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llmessageconfig_tut.cpp b/indra/test/llmessageconfig_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llmessagetemplateparser_tut.cpp b/indra/test/llmessagetemplateparser_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llpipeutil.cpp b/indra/test/llpipeutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llpipeutil.h b/indra/test/llpipeutil.h
old mode 100755
new mode 100644
diff --git a/indra/test/llsaleinfo_tut.cpp b/indra/test/llsaleinfo_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llscriptresource_tut.cpp b/indra/test/llscriptresource_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llsdmessagereader_tut.cpp b/indra/test/llsdmessagereader_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llsdtraits.h b/indra/test/llsdtraits.h
old mode 100755
new mode 100644
diff --git a/indra/test/llsdutil_tut.cpp b/indra/test/llsdutil_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llservicebuilder_tut.cpp b/indra/test/llservicebuilder_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llstreamtools_tut.cpp b/indra/test/llstreamtools_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltimestampcache_tut.cpp b/indra/test/lltimestampcache_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltranscode_tut.cpp b/indra/test/lltranscode_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltut.cpp b/indra/test/lltut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltut.h b/indra/test/lltut.h
old mode 100755
new mode 100644
diff --git a/indra/test/lluserrelations_tut.cpp b/indra/test/lluserrelations_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llxorcipher_tut.cpp b/indra/test/llxorcipher_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/mock_http_client.cpp b/indra/test/mock_http_client.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/mock_http_client.h b/indra/test/mock_http_client.h
old mode 100755
new mode 100644
diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h
old mode 100755
new mode 100644
diff --git a/indra/test/prim_linkability_tut.cpp b/indra/test/prim_linkability_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/test.h b/indra/test/test.h
old mode 100755
new mode 100644
--
cgit v1.2.3